Merge default to jingle

160 files changed, 46919 insertions, 42791 deletions

diff --git a/Makefile.am b/Makefile.am
index 9140f24f9..019f7a1d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,3 +57,12 @@ MAINTAINERCLEANDIRS = \
 	autom4te.cache \
 	build \
 	dist
+
+
+test:
+	python test/runtests.py
+.PHONY: test
+
+doc:
+	epydoc --config=doc/epydoc.conf
+.PHONY: doc
diff --git a/README.html b/README.html
index 3ddfa08d5..558d23a80 100644
--- a/README.html
+++ b/README.html
@@ -37,8 +37,8 @@ Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gno
 <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li>
 <li>gnome-python-desktop (for GnomeKeyring support)</li>
 <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
-<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is required.</li>
-<li>python-dbus bindings</li>
+<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>
+<li>python-dbus bindings (>=0.80)</li>
 <li>python-sexy to have clickable URLs in chat windows</li>
 <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li>
 </ul>
diff --git a/configure.ac b/configure.ac
index a6aadddfc..abe3115e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.12.5.6-dev],[http://trac.gajim.org/],[gajim])
+		[0.12.5.7-dev],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 
 AC_CONFIG_HEADER(config.h)
diff --git a/data/glade/chat_control_popup_menu.glade b/data/glade/chat_control_popup_menu.glade
deleted file mode 100644
index a794732b7..000000000
--- a/data/glade/chat_control_popup_menu.glade
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkMenu" id="chat_control_popup_menu">
-    <child>
-      <widget class="GtkImageMenuItem" id="add_to_roster_menuitem">
-        <property name="label">_Add to Roster</property>
-        <property name="no_show_all">True</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="_on_add_to_roster_menuitem_activate"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image3">
-            <property name="visible">True</property>
-            <property name="stock">gtk-add</property>
-            <property name="icon-size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="send_file_menuitem">
-        <property name="label">Send _File</property>
-        <property name="no_show_all">True</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="_on_send_file_menuitem_activate"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image4">
-            <property name="visible">True</property>
-            <property name="stock">gtk-save</property>
-            <property name="icon-size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="convert_to_groupchat">
-        <property name="label">Invite _Contacts</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="no_show_all">True</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">False</property>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="stock">None</property>
-            <property name="icon-size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="no_show_all">True</property>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkCheckMenuItem" id="toggle_gpg_menuitem">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">Toggle Open_PGP Encryption</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="_on_toggle_gpg_menuitem_activate"/>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkMenuItem" id="start_voip_menuitem">
-        <property name="no_show_all">True</property>
-        <property name="label" translatable="yes">Start _Voice chat</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="_on_start_voip_menuitem_activate"/>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkMenuItem" id="stop_voip_menuitem">
-        <property name="no_show_all">True</property>
-        <property name="label" translatable="yes">Stop _Voice chat</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="_on_stop_voip_menuitem_activate"/>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkCheckMenuItem" id="toggle_e2e_menuitem">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="label" translatable="yes">Toggle End to End Encryption</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="_on_toggle_e2e_menuitem_activate"/>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="no_show_all">True</property>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="information_menuitem">
-        <property name="label">gtk-info</property>
-        <property name="no_show_all">True</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="history_menuitem">
-        <property name="label">_History</property>
-        <property name="no_show_all">True</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">False</property>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="stock">gtk-justify-fill</property>
-            <property name="icon-size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/data/glade/roster_contact_context_menu.glade b/data/glade/contact_context_menu.glade
index 0629a8029..59989970d 100644
--- a/data/glade/roster_contact_context_menu.glade
+++ b/data/glade/contact_context_menu.glade
@@ -1,102 +1,150 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
 <glade-interface>
-  <widget class="GtkMenu" id="roster_contact_context_menu">
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <widget class="GtkMenu" id="contact_context_menu">
     <child>
       <widget class="GtkImageMenuItem" id="start_chat_menuitem">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">Start _Chat</property>
+        <property name="visible">True</property>
         <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
         <child internal-child="image">
-          <widget class="GtkImage" id="image1701">
+          <widget class="GtkImage" id="image2">
             <property name="visible">True</property>
             <property name="stock">gtk-jump-to</property>
-            <property name="icon_size">1</property>
+            <property name="icon-size">1</property>
           </widget>
         </child>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="send_single_message_menuitem">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">Send Single _Message...</property>
+        <property name="visible">True</property>
         <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
         <child internal-child="image">
-          <widget class="GtkImage" id="image1703">
+          <widget class="GtkImage" id="image3">
             <property name="visible">True</property>
             <property name="stock">gtk-new</property>
-            <property name="icon_size">1</property>
+            <property name="icon-size">1</property>
           </widget>
         </child>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="send_file_menuitem">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">Send _File...</property>
+        <property name="visible">True</property>
         <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
         <child internal-child="image">
-          <widget class="GtkImage" id="image1706">
+          <widget class="GtkImage" id="image4">
             <property name="visible">True</property>
             <property name="stock">gtk-save</property>
-            <property name="icon_size">1</property>
+            <property name="icon-size">1</property>
           </widget>
         </child>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="invite_menuitem">
-        <property name="visible">True</property>
         <property name="label" translatable="yes">In_vite to</property>
+        <property name="visible">True</property>
         <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
         <child internal-child="image">
-          <widget class="GtkImage" id="image1704">
+          <widget class="GtkImage" id="image5">
             <property name="visible">True</property>
-            <property name="stock">gtk-go-back</property>
-            <property name="icon_size">1</property>
+            <property name="stock">gtk-missing-image</property>
+            <property name="icon-size">1</property>
           </widget>
         </child>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="above_send_file_separator">
+      <widget class="GtkImageMenuItem" id="convert_to_groupchat_menuitem">
+        <property name="label" translatable="yes">Invite _Contacts</property>
         <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
+        <child internal-child="image">
+          <widget class="GtkImage" id="image1">
+            <property name="visible">True</property>
+            <property name="stock">gtk-missing-image</property>
+            <property name="icon-size">1</property>
+          </widget>
+        </child>
       </widget>
     </child>
     <child>
-      <widget class="GtkImageMenuItem" id="send_custom_status_menuitem">
+      <widget class="GtkSeparatorMenuItem" id="encryption_separator">
         <property name="visible">True</property>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkCheckMenuItem" id="toggle_gpg_menuitem">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Toggle Open_PGP Encryption</property>
+        <property name="use_underline">True</property>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkCheckMenuItem" id="toggle_e2e_menuitem">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Toggle End to End Encryption</property>
+        <property name="use_underline">True</property>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkSeparatorMenuItem" id="menuitem3">
+        <property name="visible">True</property>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="send_custom_status_menuitem">
         <property name="label" translatable="yes">Send Cus_tom Status</property>
+        <property name="visible">True</property>
         <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
         <child>
           <widget class="GtkMenu" id="menu5">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
           </widget>
         </child>
+        <child internal-child="image">
+          <widget class="GtkImage" id="image6">
+            <property name="visible">True</property>
+            <property name="stock">gtk-missing-image</property>
+            <property name="icon-size">1</property>
+          </widget>
+        </child>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="execute_command_menuitem">
+        <property name="label" translatable="yes">E_xecute Command...</property>
         <property name="visible">True</property>
-        <property name="label" translatable="yes">Execute Command...</property>
         <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
         <child internal-child="image">
-          <widget class="GtkImage" id="image1709">
+          <widget class="GtkImage" id="image7">
             <property name="visible">True</property>
             <property name="stock">gtk-execute</property>
-            <property name="icon_size">1</property>
+            <property name="icon-size">1</property>
           </widget>
         </child>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="manage_contact">
+        <property name="label" translatable="yes">_Manage Contact</property>
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="label" translatable="yes">_Manage Contact</property>
         <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
         <child>
           <widget class="GtkMenu" id="menu2">
             <property name="visible">True</property>
@@ -105,11 +153,12 @@
               <widget class="GtkImageMenuItem" id="rename_menuitem">
                 <property name="label" translatable="yes">_Rename...</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="image1705">
+                  <widget class="GtkImage" id="image9">
                     <property name="visible">True</property>
                     <property name="stock">gtk-refresh</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
@@ -118,12 +167,12 @@
               <widget class="GtkImageMenuItem" id="edit_groups_menuitem">
                 <property name="label" translatable="yes">Edit _Groups...</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="menu-item-image21">
+                  <widget class="GtkImage" id="image10">
                     <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="stock">gtk-edit</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
@@ -132,42 +181,44 @@
               <widget class="GtkImageMenuItem" id="assign_openpgp_key_menuitem">
                 <property name="label" translatable="yes">Assign Open_PGP Key...</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate"/>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="image1707">
+                  <widget class="GtkImage" id="image11">
                     <property name="visible">True</property>
                     <property name="stock">gtk-dialog-authentication</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="set_custom_avatar_menuitem">
+                <property name="label" translatable="yes">Set Custom _Avatar...</property>
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Set Custom _Avatar...</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="menu-item-image20">
+                  <widget class="GtkImage" id="image12">
                     <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="stock">gtk-orientation-portrait</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="add_special_notification_menuitem">
-                <property name="no_show_all">True</property>
                 <property name="label" translatable="yes">Add Special _Notification...</property>
+                <property name="no_show_all">True</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="image1708">
+                  <widget class="GtkImage" id="image13">
                     <property name="visible">True</property>
                     <property name="stock">gtk-info</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
@@ -182,46 +233,50 @@
               <widget class="GtkImageMenuItem" id="subscription_menuitem">
                 <property name="label" translatable="yes">_Subscription</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child>
                   <widget class="GtkMenu" id="subscription_menuitem_menu">
                     <child>
                       <widget class="GtkImageMenuItem" id="resend_authorization_to_menuitem">
-                        <property name="visible">True</property>
                         <property name="label" translatable="yes">_Allow him/her to see my status</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="image1711">
+                          <widget class="GtkImage" id="image15">
                             <property name="visible">True</property>
                             <property name="stock">gtk-go-up</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="rerequest_authorization_from_menuitem">
-                        <property name="visible">True</property>
                         <property name="label" translatable="yes">A_sk to see his/her status</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="image1712">
+                          <widget class="GtkImage" id="image16">
                             <property name="visible">True</property>
                             <property name="stock">gtk-go-down</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="forbid_him/her_to_see_my_status1">
-                        <property name="visible">True</property>
                         <property name="label" translatable="yes">_Forbid him/her to see my status</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="image1713">
+                          <widget class="GtkImage" id="image17">
                             <property name="visible">True</property>
                             <property name="stock">gtk-stop</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
@@ -229,66 +284,70 @@
                   </widget>
                 </child>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="image1710">
+                  <widget class="GtkImage" id="image14">
                     <property name="visible">True</property>
                     <property name="stock">gtk-dialog-question</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="unblock_menuitem">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">_Unblock</property>
+                <property name="visible">True</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="image1715">
+                  <widget class="GtkImage" id="image18">
                     <property name="visible">True</property>
                     <property name="stock">gtk-stop</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="block_menuitem">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">_Block</property>
+                <property name="visible">True</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="image1714">
+                  <widget class="GtkImage" id="image19">
                     <property name="visible">True</property>
                     <property name="stock">gtk-stop</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="unignore_menuitem">
-                <property name="no_show_all">True</property>
                 <property name="label" translatable="yes">_Unignore</property>
+                <property name="no_show_all">True</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="menu-item-image22">
+                  <widget class="GtkImage" id="image20">
                     <property name="visible">True</property>
                     <property name="stock">gtk-stop</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
             </child>
             <child>
               <widget class="GtkImageMenuItem" id="ignore_menuitem">
-                <property name="no_show_all">True</property>
                 <property name="label" translatable="yes">_Ignore</property>
+                <property name="no_show_all">True</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="menu-item-image23">
+                  <widget class="GtkImage" id="image21">
                     <property name="visible">True</property>
                     <property name="stock">gtk-stop</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
@@ -297,11 +356,12 @@
               <widget class="GtkImageMenuItem" id="add_to_roster_menuitem">
                 <property name="label" translatable="yes">_Add to Roster...</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="image1716">
+                  <widget class="GtkImage" id="image22">
                     <property name="visible">True</property>
                     <property name="stock">gtk-add</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
@@ -310,11 +370,12 @@
               <widget class="GtkImageMenuItem" id="remove_from_roster_menuitem">
                 <property name="label" translatable="yes">Remo_ve</property>
                 <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
                 <child internal-child="image">
-                  <widget class="GtkImage" id="image1717">
+                  <widget class="GtkImage" id="image23">
                     <property name="visible">True</property>
                     <property name="stock">gtk-remove</property>
-                    <property name="icon_size">1</property>
+                    <property name="icon-size">1</property>
                   </widget>
                 </child>
               </widget>
@@ -322,17 +383,16 @@
           </widget>
         </child>
         <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image19">
+          <widget class="GtkImage" id="image8">
             <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="stock">gtk-properties</property>
-            <property name="icon_size">1</property>
+            <property name="icon-size">1</property>
           </widget>
         </child>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="separator6">
+      <widget class="GtkSeparatorMenuItem" id="last_separator">
         <property name="visible">True</property>
       </widget>
     </child>
@@ -347,11 +407,12 @@
       <widget class="GtkImageMenuItem" id="history_menuitem">
         <property name="label" translatable="yes">_History</property>
         <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
         <child internal-child="image">
-          <widget class="GtkImage" id="image1718">
+          <widget class="GtkImage" id="image24">
             <property name="visible">True</property>
             <property name="stock">gtk-justify-fill</property>
-            <property name="icon_size">1</property>
+            <property name="icon-size">1</property>
           </widget>
         </child>
       </widget>
diff --git a/data/glade/zeroconf_contact_context_menu.glade b/data/glade/zeroconf_contact_context_menu.glade
deleted file mode 100644
index 93d901f1c..000000000
--- a/data/glade/zeroconf_contact_context_menu.glade
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkMenu" id="zeroconf_contact_context_menu">
-    <child>
-      <widget class="GtkImageMenuItem" id="start_chat_menuitem">
-        <property name="label">Start _Chat</property>
-        <property name="visible">True</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">False</property>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image9">
-            <property name="visible">True</property>
-            <property name="stock">gtk-jump-to</property>
-            <property name="icon-size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="send_file_menuitem">
-        <property name="label">Send _File</property>
-        <property name="visible">True</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">False</property>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image10">
-            <property name="visible">True</property>
-            <property name="stock">gtk-save</property>
-            <property name="icon-size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkSeparatorMenuItem" id="above_send_file_separator">
-        <property name="visible">True</property>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="execute_command_menuitem">
-        <property name="label" translatable="yes">Execute Command...</property>
-        <property name="visible">True</property>
-        <property name="use_stock">False</property>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="stock">gtk-execute</property>
-            <property name="icon-size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="manage_contact">
-        <property name="label">_Manage Contact</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">False</property>
-        <child>
-          <widget class="GtkMenu" id="menu2">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <child>
-              <widget class="GtkImageMenuItem" id="rename_menuitem">
-                <property name="label">_Rename</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">False</property>
-                <child internal-child="image">
-                  <widget class="GtkImage" id="image7">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-refresh</property>
-                    <property name="icon-size">1</property>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="edit_groups_menuitem">
-                <property name="label">Edit _Groups</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">False</property>
-                <child internal-child="image">
-                  <widget class="GtkImage" id="image6">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-edit</property>
-                    <property name="icon-size">1</property>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="assign_openpgp_key_menuitem">
-                <property name="label">Assign Open_PGP Key</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">False</property>
-                <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate"/>
-                <child internal-child="image">
-                  <widget class="GtkImage" id="image5">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-dialog-authentication</property>
-                    <property name="icon-size">1</property>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkImageMenuItem" id="add_special_notification_menuitem">
-                <property name="label">Add Special _Notification</property>
-                <property name="no_show_all">True</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">False</property>
-                <child internal-child="image">
-                  <widget class="GtkImage" id="image3">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-info</property>
-                    <property name="icon-size">1</property>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-          </widget>
-        </child>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image8">
-            <property name="visible">True</property>
-            <property name="stock">gtk-properties</property>
-            <property name="icon-size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkSeparatorMenuItem" id="separator6">
-        <property name="visible">True</property>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="information_menuitem">
-        <property name="label">_Information</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">False</property>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image4">
-            <property name="visible">True</property>
-            <property name="stock">gtk-info</property>
-            <property name="icon-size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="history_menuitem">
-        <property name="label">_History</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">False</property>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="stock">gtk-justify-fill</property>
-            <property name="icon-size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/data/iconsets/crystal/16x16/away.png b/data/iconsets/crystal/16x16/away.png
deleted file mode 100644
index 8d9b13a95..000000000
--- a/data/iconsets/crystal/16x16/away.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/chat.png b/data/iconsets/crystal/16x16/chat.png
deleted file mode 100644
index d881baa4d..000000000
--- a/data/iconsets/crystal/16x16/chat.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/closed.png b/data/iconsets/crystal/16x16/closed.png
deleted file mode 100644
index 344eeea45..000000000
--- a/data/iconsets/crystal/16x16/closed.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/connecting.gif b/data/iconsets/crystal/16x16/connecting.gif
deleted file mode 100644
index bdd125ae3..000000000
--- a/data/iconsets/crystal/16x16/connecting.gif
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/dnd.png b/data/iconsets/crystal/16x16/dnd.png
deleted file mode 100644
index 7b8298fdd..000000000
--- a/data/iconsets/crystal/16x16/dnd.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/error.png b/data/iconsets/crystal/16x16/error.png
deleted file mode 100644
index 9152973b9..000000000
--- a/data/iconsets/crystal/16x16/error.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/event.gif b/data/iconsets/crystal/16x16/event.gif
deleted file mode 100644
index 4a36aa2ce..000000000
--- a/data/iconsets/crystal/16x16/event.gif
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/invisible.png b/data/iconsets/crystal/16x16/invisible.png
deleted file mode 100644
index ee0e93fa8..000000000
--- a/data/iconsets/crystal/16x16/invisible.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/muc_active.png b/data/iconsets/crystal/16x16/muc_active.png
deleted file mode 100644
index efdd60f12..000000000
--- a/data/iconsets/crystal/16x16/muc_active.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/muc_inactive.png b/data/iconsets/crystal/16x16/muc_inactive.png
deleted file mode 100644
index 0bf75af15..000000000
--- a/data/iconsets/crystal/16x16/muc_inactive.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/not_in_roster.png b/data/iconsets/crystal/16x16/not_in_roster.png
deleted file mode 100644
index 9f9006605..000000000
--- a/data/iconsets/crystal/16x16/not_in_roster.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/offline.png b/data/iconsets/crystal/16x16/offline.png
deleted file mode 100644
index 26e69a71c..000000000
--- a/data/iconsets/crystal/16x16/offline.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/online.png b/data/iconsets/crystal/16x16/online.png
deleted file mode 100644
index 2dcabc4a1..000000000
--- a/data/iconsets/crystal/16x16/online.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/opened.png b/data/iconsets/crystal/16x16/opened.png
deleted file mode 100644
index de0a8c646..000000000
--- a/data/iconsets/crystal/16x16/opened.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/requested.png b/data/iconsets/crystal/16x16/requested.png
deleted file mode 100644
index 067ff9546..000000000
--- a/data/iconsets/crystal/16x16/requested.png
+++ /dev/null
diff --git a/data/iconsets/crystal/16x16/xa.png b/data/iconsets/crystal/16x16/xa.png
deleted file mode 100644
index 117114361..000000000
--- a/data/iconsets/crystal/16x16/xa.png
+++ /dev/null
diff --git a/data/iconsets/crystal/32x32/muc_active.png b/data/iconsets/crystal/32x32/muc_active.png
deleted file mode 100644
index 3c7474c82..000000000
--- a/data/iconsets/crystal/32x32/muc_active.png
+++ /dev/null
diff --git a/data/iconsets/crystal/32x32/muc_inactive.png b/data/iconsets/crystal/32x32/muc_inactive.png
deleted file mode 100644
index 279843fde..000000000
--- a/data/iconsets/crystal/32x32/muc_inactive.png
+++ /dev/null
diff --git a/data/iconsets/crystal/48x48/offline.png b/data/iconsets/crystal/48x48/offline.png
deleted file mode 100644
index 26e69a71c..000000000
--- a/data/iconsets/crystal/48x48/offline.png
+++ /dev/null
diff --git a/data/iconsets/crystal/48x48/online.png b/data/iconsets/crystal/48x48/online.png
deleted file mode 100644
index 2dcabc4a1..000000000
--- a/data/iconsets/crystal/48x48/online.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/away.png b/data/iconsets/gossip/16x16/away.png
deleted file mode 100644
index 359993c9a..000000000
--- a/data/iconsets/gossip/16x16/away.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/chat.png b/data/iconsets/gossip/16x16/chat.png
deleted file mode 100644
index b7677906d..000000000
--- a/data/iconsets/gossip/16x16/chat.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/closed.png b/data/iconsets/gossip/16x16/closed.png
deleted file mode 100644
index d89883096..000000000
--- a/data/iconsets/gossip/16x16/closed.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/connecting.gif b/data/iconsets/gossip/16x16/connecting.gif
deleted file mode 100644
index b8803e164..000000000
--- a/data/iconsets/gossip/16x16/connecting.gif
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/dnd.png b/data/iconsets/gossip/16x16/dnd.png
deleted file mode 100644
index 190c5ae70..000000000
--- a/data/iconsets/gossip/16x16/dnd.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/error.png b/data/iconsets/gossip/16x16/error.png
deleted file mode 100644
index 5658e072b..000000000
--- a/data/iconsets/gossip/16x16/error.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/event.png b/data/iconsets/gossip/16x16/event.png
deleted file mode 100644
index 4c6bfc64d..000000000
--- a/data/iconsets/gossip/16x16/event.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/invisible.png b/data/iconsets/gossip/16x16/invisible.png
deleted file mode 100644
index a28263375..000000000
--- a/data/iconsets/gossip/16x16/invisible.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/muc_active.png b/data/iconsets/gossip/16x16/muc_active.png
deleted file mode 100644
index efdd60f12..000000000
--- a/data/iconsets/gossip/16x16/muc_active.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/muc_inactive.png b/data/iconsets/gossip/16x16/muc_inactive.png
deleted file mode 100644
index 0bf75af15..000000000
--- a/data/iconsets/gossip/16x16/muc_inactive.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/not_in_roster.png b/data/iconsets/gossip/16x16/not_in_roster.png
deleted file mode 100644
index df8f0b2da..000000000
--- a/data/iconsets/gossip/16x16/not_in_roster.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/offline.png b/data/iconsets/gossip/16x16/offline.png
deleted file mode 100644
index df06e4b2b..000000000
--- a/data/iconsets/gossip/16x16/offline.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/online.png b/data/iconsets/gossip/16x16/online.png
deleted file mode 100644
index be9cd475c..000000000
--- a/data/iconsets/gossip/16x16/online.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/opened.png b/data/iconsets/gossip/16x16/opened.png
deleted file mode 100644
index 198a2ed2f..000000000
--- a/data/iconsets/gossip/16x16/opened.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/requested.png b/data/iconsets/gossip/16x16/requested.png
deleted file mode 100644
index 495569e32..000000000
--- a/data/iconsets/gossip/16x16/requested.png
+++ /dev/null
diff --git a/data/iconsets/gossip/16x16/xa.png b/data/iconsets/gossip/16x16/xa.png
deleted file mode 100644
index 0e61eeb51..000000000
--- a/data/iconsets/gossip/16x16/xa.png
+++ /dev/null
diff --git a/data/iconsets/gossip/32x32/muc_active.png b/data/iconsets/gossip/32x32/muc_active.png
deleted file mode 100644
index 3c7474c82..000000000
--- a/data/iconsets/gossip/32x32/muc_active.png
+++ /dev/null
diff --git a/data/iconsets/gossip/32x32/muc_inactive.png b/data/iconsets/gossip/32x32/muc_inactive.png
deleted file mode 100644
index 279843fde..000000000
--- a/data/iconsets/gossip/32x32/muc_inactive.png
+++ /dev/null
diff --git a/data/iconsets/gossip/48x48/offline.png b/data/iconsets/gossip/48x48/offline.png
deleted file mode 100644
index df06e4b2b..000000000
--- a/data/iconsets/gossip/48x48/offline.png
+++ /dev/null
diff --git a/data/iconsets/gossip/48x48/online.png b/data/iconsets/gossip/48x48/online.png
deleted file mode 100644
index be9cd475c..000000000
--- a/data/iconsets/gossip/48x48/online.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/away.png b/data/iconsets/nuvola/16x16/away.png
deleted file mode 100644
index 606b1b0d8..000000000
--- a/data/iconsets/nuvola/16x16/away.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/chat.png b/data/iconsets/nuvola/16x16/chat.png
deleted file mode 100644
index 3104ee23f..000000000
--- a/data/iconsets/nuvola/16x16/chat.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/closed.png b/data/iconsets/nuvola/16x16/closed.png
deleted file mode 100644
index 83873d1df..000000000
--- a/data/iconsets/nuvola/16x16/closed.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/connecting.png b/data/iconsets/nuvola/16x16/connecting.png
deleted file mode 100644
index 558aa7200..000000000
--- a/data/iconsets/nuvola/16x16/connecting.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/dnd.png b/data/iconsets/nuvola/16x16/dnd.png
deleted file mode 100644
index bedf5eb58..000000000
--- a/data/iconsets/nuvola/16x16/dnd.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/error.png b/data/iconsets/nuvola/16x16/error.png
deleted file mode 100644
index 0ecf3a82c..000000000
--- a/data/iconsets/nuvola/16x16/error.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/event.gif b/data/iconsets/nuvola/16x16/event.gif
deleted file mode 100644
index 75530547c..000000000
--- a/data/iconsets/nuvola/16x16/event.gif
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/invisible.png b/data/iconsets/nuvola/16x16/invisible.png
deleted file mode 100644
index 9586cd519..000000000
--- a/data/iconsets/nuvola/16x16/invisible.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/muc_active.png b/data/iconsets/nuvola/16x16/muc_active.png
deleted file mode 100644
index efdd60f12..000000000
--- a/data/iconsets/nuvola/16x16/muc_active.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/muc_inactive.png b/data/iconsets/nuvola/16x16/muc_inactive.png
deleted file mode 100644
index 0bf75af15..000000000
--- a/data/iconsets/nuvola/16x16/muc_inactive.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/not_in_roster.png b/data/iconsets/nuvola/16x16/not_in_roster.png
deleted file mode 100644
index dbd0e0c50..000000000
--- a/data/iconsets/nuvola/16x16/not_in_roster.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/offline.png b/data/iconsets/nuvola/16x16/offline.png
deleted file mode 100644
index e8c7f9d13..000000000
--- a/data/iconsets/nuvola/16x16/offline.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/online.png b/data/iconsets/nuvola/16x16/online.png
deleted file mode 100644
index 4dffc2f0c..000000000
--- a/data/iconsets/nuvola/16x16/online.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/opened.png b/data/iconsets/nuvola/16x16/opened.png
deleted file mode 100644
index c5b830999..000000000
--- a/data/iconsets/nuvola/16x16/opened.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/requested.png b/data/iconsets/nuvola/16x16/requested.png
deleted file mode 100644
index dbd0e0c50..000000000
--- a/data/iconsets/nuvola/16x16/requested.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/16x16/xa.png b/data/iconsets/nuvola/16x16/xa.png
deleted file mode 100644
index 6849ec7d7..000000000
--- a/data/iconsets/nuvola/16x16/xa.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/32x32/muc_active.png b/data/iconsets/nuvola/32x32/muc_active.png
deleted file mode 100644
index 3c7474c82..000000000
--- a/data/iconsets/nuvola/32x32/muc_active.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/32x32/muc_inactive.png b/data/iconsets/nuvola/32x32/muc_inactive.png
deleted file mode 100644
index 279843fde..000000000
--- a/data/iconsets/nuvola/32x32/muc_inactive.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/48x48/offline.png b/data/iconsets/nuvola/48x48/offline.png
deleted file mode 100644
index e8c7f9d13..000000000
--- a/data/iconsets/nuvola/48x48/offline.png
+++ /dev/null
diff --git a/data/iconsets/nuvola/48x48/online.png b/data/iconsets/nuvola/48x48/online.png
deleted file mode 100644
index 4dffc2f0c..000000000
--- a/data/iconsets/nuvola/48x48/online.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/away.png b/data/iconsets/simplebulb/16x16/away.png
deleted file mode 100644
index 96ad30cb8..000000000
--- a/data/iconsets/simplebulb/16x16/away.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/chat.png b/data/iconsets/simplebulb/16x16/chat.png
deleted file mode 100644
index a6f90a2fb..000000000
--- a/data/iconsets/simplebulb/16x16/chat.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/closed.png b/data/iconsets/simplebulb/16x16/closed.png
deleted file mode 100644
index aed216df1..000000000
--- a/data/iconsets/simplebulb/16x16/closed.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/connecting.png b/data/iconsets/simplebulb/16x16/connecting.png
deleted file mode 100644
index e5d80c172..000000000
--- a/data/iconsets/simplebulb/16x16/connecting.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/dnd.png b/data/iconsets/simplebulb/16x16/dnd.png
deleted file mode 100644
index e028df8f9..000000000
--- a/data/iconsets/simplebulb/16x16/dnd.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/error.png b/data/iconsets/simplebulb/16x16/error.png
deleted file mode 100644
index 588511d43..000000000
--- a/data/iconsets/simplebulb/16x16/error.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/event.png b/data/iconsets/simplebulb/16x16/event.png
deleted file mode 100644
index bb6bf86a1..000000000
--- a/data/iconsets/simplebulb/16x16/event.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/invisible.png b/data/iconsets/simplebulb/16x16/invisible.png
deleted file mode 100644
index 18291f8b8..000000000
--- a/data/iconsets/simplebulb/16x16/invisible.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/muc_active.png b/data/iconsets/simplebulb/16x16/muc_active.png
deleted file mode 100644
index efdd60f12..000000000
--- a/data/iconsets/simplebulb/16x16/muc_active.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/muc_inactive.png b/data/iconsets/simplebulb/16x16/muc_inactive.png
deleted file mode 100644
index 0bf75af15..000000000
--- a/data/iconsets/simplebulb/16x16/muc_inactive.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/not_in_roster.png b/data/iconsets/simplebulb/16x16/not_in_roster.png
deleted file mode 100644
index f8fc73dcf..000000000
--- a/data/iconsets/simplebulb/16x16/not_in_roster.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/offline.png b/data/iconsets/simplebulb/16x16/offline.png
deleted file mode 100644
index 3fa410da1..000000000
--- a/data/iconsets/simplebulb/16x16/offline.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/online.png b/data/iconsets/simplebulb/16x16/online.png
deleted file mode 100644
index c6ad0d535..000000000
--- a/data/iconsets/simplebulb/16x16/online.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/opened.png b/data/iconsets/simplebulb/16x16/opened.png
deleted file mode 100644
index d688fb41e..000000000
--- a/data/iconsets/simplebulb/16x16/opened.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/requested.png b/data/iconsets/simplebulb/16x16/requested.png
deleted file mode 100644
index 40c8c952b..000000000
--- a/data/iconsets/simplebulb/16x16/requested.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/16x16/xa.png b/data/iconsets/simplebulb/16x16/xa.png
deleted file mode 100644
index 9e1cae85a..000000000
--- a/data/iconsets/simplebulb/16x16/xa.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/32x32/muc_active.png b/data/iconsets/simplebulb/32x32/muc_active.png
deleted file mode 100644
index 3c7474c82..000000000
--- a/data/iconsets/simplebulb/32x32/muc_active.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/32x32/muc_inactive.png b/data/iconsets/simplebulb/32x32/muc_inactive.png
deleted file mode 100644
index 279843fde..000000000
--- a/data/iconsets/simplebulb/32x32/muc_inactive.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/48x48/offline.png b/data/iconsets/simplebulb/48x48/offline.png
deleted file mode 100644
index 3fa410da1..000000000
--- a/data/iconsets/simplebulb/48x48/offline.png
+++ /dev/null
diff --git a/data/iconsets/simplebulb/48x48/online.png b/data/iconsets/simplebulb/48x48/online.png
deleted file mode 100644
index c6ad0d535..000000000
--- a/data/iconsets/simplebulb/48x48/online.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/away.png b/data/iconsets/stellar/16x16/away.png
deleted file mode 100644
index 58e55873d..000000000
--- a/data/iconsets/stellar/16x16/away.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/chat.png b/data/iconsets/stellar/16x16/chat.png
deleted file mode 100644
index 0427ebc51..000000000
--- a/data/iconsets/stellar/16x16/chat.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/closed.png b/data/iconsets/stellar/16x16/closed.png
deleted file mode 100644
index d89883096..000000000
--- a/data/iconsets/stellar/16x16/closed.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/connecting.gif b/data/iconsets/stellar/16x16/connecting.gif
deleted file mode 100644
index 5a67e74b1..000000000
--- a/data/iconsets/stellar/16x16/connecting.gif
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/dnd.png b/data/iconsets/stellar/16x16/dnd.png
deleted file mode 100644
index 6ea0b2dd7..000000000
--- a/data/iconsets/stellar/16x16/dnd.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/error.png b/data/iconsets/stellar/16x16/error.png
deleted file mode 100644
index 5658e072b..000000000
--- a/data/iconsets/stellar/16x16/error.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/event.gif b/data/iconsets/stellar/16x16/event.gif
deleted file mode 100644
index 7e78a07c9..000000000
--- a/data/iconsets/stellar/16x16/event.gif
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/invisible.png b/data/iconsets/stellar/16x16/invisible.png
deleted file mode 100644
index 4d959d700..000000000
--- a/data/iconsets/stellar/16x16/invisible.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/muc_active.png b/data/iconsets/stellar/16x16/muc_active.png
deleted file mode 100644
index efdd60f12..000000000
--- a/data/iconsets/stellar/16x16/muc_active.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/muc_inactive.png b/data/iconsets/stellar/16x16/muc_inactive.png
deleted file mode 100644
index 0bf75af15..000000000
--- a/data/iconsets/stellar/16x16/muc_inactive.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/not_in_roster.png b/data/iconsets/stellar/16x16/not_in_roster.png
deleted file mode 100644
index e209800ca..000000000
--- a/data/iconsets/stellar/16x16/not_in_roster.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/offline.png b/data/iconsets/stellar/16x16/offline.png
deleted file mode 100644
index c591a6926..000000000
--- a/data/iconsets/stellar/16x16/offline.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/online.png b/data/iconsets/stellar/16x16/online.png
deleted file mode 100644
index 575b73c92..000000000
--- a/data/iconsets/stellar/16x16/online.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/opened.png b/data/iconsets/stellar/16x16/opened.png
deleted file mode 100644
index 198a2ed2f..000000000
--- a/data/iconsets/stellar/16x16/opened.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/requested.png b/data/iconsets/stellar/16x16/requested.png
deleted file mode 100644
index cc34197d4..000000000
--- a/data/iconsets/stellar/16x16/requested.png
+++ /dev/null
diff --git a/data/iconsets/stellar/16x16/xa.png b/data/iconsets/stellar/16x16/xa.png
deleted file mode 100644
index e1a917d24..000000000
--- a/data/iconsets/stellar/16x16/xa.png
+++ /dev/null
diff --git a/data/iconsets/stellar/32x32/muc_active.png b/data/iconsets/stellar/32x32/muc_active.png
deleted file mode 100644
index 3c7474c82..000000000
--- a/data/iconsets/stellar/32x32/muc_active.png
+++ /dev/null
diff --git a/data/iconsets/stellar/32x32/muc_inactive.png b/data/iconsets/stellar/32x32/muc_inactive.png
deleted file mode 100644
index 279843fde..000000000
--- a/data/iconsets/stellar/32x32/muc_inactive.png
+++ /dev/null
diff --git a/data/iconsets/stellar/48x48/offline.png b/data/iconsets/stellar/48x48/offline.png
deleted file mode 100644
index c591a6926..000000000
--- a/data/iconsets/stellar/48x48/offline.png
+++ /dev/null
diff --git a/data/iconsets/stellar/48x48/online.png b/data/iconsets/stellar/48x48/online.png
deleted file mode 100644
index 575b73c92..000000000
--- a/data/iconsets/stellar/48x48/online.png
+++ /dev/null
diff --git a/epydoc.conf b/doc/epydoc.conf
index b2a1c0565..f58ddfcd4 100644
--- a/epydoc.conf
+++ b/doc/epydoc.conf
@@ -18,7 +18,7 @@ modules: src/* test/*
 # Write html output to the directory "apidocs"
 #output: pdf
 output: html
-target: apidocs/
+target: doc/apidocs/
 
 # Include all automatically generated graphs.  These graphs are
 # generated using Graphviz dot.
diff --git a/gajim.nsi b/gajim.nsi
index 9dca63a4b..b4a87e1bf 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -255,11 +255,6 @@ SectionGroupEnd
 

 SectionGroup $(NAME_Iconsets)

 

-Section "crystal" SecIconsetsCrystal

-	SetOutPath "$INSTDIR\data\iconsets"

-	File /r "data\iconsets\crystal"

-SectionEnd

-

 Section "dcraven" SecIconsetsDcraven

 	SectionIn RO

 	SetOutPath "$INSTDIR\data\iconsets"

@@ -276,11 +271,6 @@ Section "goojim" SecIconsetsGoojim
 	File /r "data\iconsets\goojim"

 SectionEnd

 

-Section "gossip" SecIconsetsGossip

-	SetOutPath "$INSTDIR\data\iconsets"

-	File /r "data\iconsets\gossip"

-SectionEnd

-

 Section "gota" SecIconsetsGota

 	SetOutPath "$INSTDIR\data\iconsets"

 	File /r "data\iconsets\gota"

@@ -291,21 +281,6 @@ Section "jabberbulb" SecIconsetsJabberbulb
 	File /r "data\iconsets\jabberbulb"

 SectionEnd

 

-Section "nuvola" SecIconsetsNuvola

-	SetOutPath "$INSTDIR\data\iconsets"

-	File /r "data\iconsets\nuvola"

-SectionEnd

-

-Section "simplebulb" SecIconsetsSimplebulb

-	SetOutPath "$INSTDIR\data\iconsets"

-	File /r "data\iconsets\simplebulb"

-SectionEnd

-

-Section "stellar" SecIconsetsStellar

-	SetOutPath "$INSTDIR\data\iconsets"

-	File /r "data\iconsets\stellar"

-SectionEnd

-

 Section "sun" SecIconsetsSun

 	SetOutPath "$INSTDIR\data\iconsets"

 	File /r "data\iconsets\sun"

@@ -711,16 +686,11 @@ Section "Uninstall"
 	RMDir /r "$INSTDIR\data\emoticons\static"

 	RMDir /r "$INSTDIR\data\emoticons\static-big"

 	RMDir "$INSTDIR\data\emoticons"

-	RMDir /r "$INSTDIR\data\iconsets\crystal"

 	RMDir /r "$INSTDIR\data\iconsets\dcraven"

 	RMDir /r "$INSTDIR\data\iconsets\gnome"

 	RMDir /r "$INSTDIR\data\iconsets\goojim"

-	RMDir /r "$INSTDIR\data\iconsets\gossip"

 	RMDir /r "$INSTDIR\data\iconsets\gota"

 	RMDir /r "$INSTDIR\data\iconsets\jabberbulb"

-	RMDir /r "$INSTDIR\data\iconsets\nuvola"

-	RMDir /r "$INSTDIR\data\iconsets\simplebulb"

-	RMDir /r "$INSTDIR\data\iconsets\stellar"

 	RMDir /r "$INSTDIR\data\iconsets\sun"

 	RMDir /r "$INSTDIR\data\iconsets\transports"

 	RMDir "$INSTDIR\data\iconsets"

diff --git a/po/be.po b/po/be.po
index 0bd728bd6..417baf264 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:42+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -220,6 +220,7 @@ msgstr "<b>Асабістыя звесткі</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Рахунак"
 
@@ -287,8 +288,8 @@ msgstr "Змяніць асабістыя звесткі..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -299,8 +300,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Агульная"
 
@@ -359,25 +360,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Звесткі аб Вас, якія захоўваюцца на серверы"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Ключ не выбраны"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ніякі"
 
@@ -533,8 +530,8 @@ msgstr ""
 "Вам можа спатрэбіцца таксама змяніць настаўленні фаервола."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -548,7 +545,7 @@ msgid "Mer_ge accounts"
 msgstr "_Аб'яднаць рахункі"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "_Змяніць імя"
 
@@ -810,7 +807,7 @@ msgid "All statuses"
 msgstr "Усе станы"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Сышоў"
 
@@ -827,7 +824,7 @@ msgid "Have "
 msgstr "Мае "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Нябачны"
 
@@ -836,7 +833,7 @@ msgid "Launch a command"
 msgstr "Выканаць загад"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Мяне няма"
 
@@ -1028,7 +1025,7 @@ msgid "Join _Group Chat"
 msgstr "Удзельнічаць у _групавой размове"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "_Дадаць у кантактны ліст"
@@ -1055,65 +1052,154 @@ msgstr "_Адкрыць у праглядальніку"
 msgid "_Start Chat"
 msgstr "_Пачаць размову"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "За_прасіць"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Назіральнікі"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Спытацца _дазволу праглядаць змены стану"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Дадаць спецыяльнае _нагадванне"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Прызначыць ключ Open_PGP"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Выканаць загад..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Змяніць _групы"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "За_прасіць"
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Людзі"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "Вы_даліць"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Адправіць асаблівы XML"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Адправіць _асобнае паведамленне..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "Адправіць _файл"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Пачаць _размову"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Пераключыць шыфраванне Open_PGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Пераключыць шыфраванне Open_PGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Дадаць у кантактны ліст"
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "Дазволіць чалавеку _бачыць змены майго стану"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Забараніць праглядаць змены майго стану"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "_Журнал"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "За_прасіць"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "Назіральнікі"
+msgid "_Manage Contact"
+msgstr "Змяніць імя чалавека"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "Змяніць _імя"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "П_адпіска"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "дзевяць"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Запоўніце форму."
@@ -1232,7 +1318,7 @@ msgstr ""
 "Шэраг людзей\n"
 "Банер размовы"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Тлусты"
 
@@ -1256,7 +1342,7 @@ msgstr "Знік"
 msgid "Inactive"
 msgstr "Неактыўны"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Нахілены"
 
@@ -1334,6 +1420,14 @@ msgstr "Ма_дэратар"
 msgid "Occupant Actions"
 msgstr "_Дзеянні ўдзельнікаў"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Адправіць _файл"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Дадаць у кантактны ліст"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Адміністратар"
@@ -1342,13 +1436,6 @@ msgstr "_Адміністратар"
 msgid "_Ban"
 msgstr "_Забараніць казанне"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Выкінуць"
@@ -1365,13 +1452,6 @@ msgstr "_Уладальнік"
 msgid "_Send Private Message"
 msgstr "Ад_правіць прыватнае паведамленне"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Голас"
@@ -1380,7 +1460,7 @@ msgstr "_Голас"
 msgid "Create new post"
 msgstr "Стварыць новы допіс"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Ад"
 
@@ -1411,8 +1491,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim - Кіраўнік журналаў размоў"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Выдаліць"
 
@@ -1458,34 +1538,39 @@ msgstr "Пошук"
 msgid "_Log conversation history"
 msgstr "_Весці журнал размоў"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "_Змясціць у закладках"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Удзельнічаць у групавой размове"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Увайсці ў гэты пакой па злучэнні"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Мянушка:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Нядаўна:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Пакой:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Далучыцца"
@@ -1516,7 +1601,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Стан друку:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -2072,7 +2157,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "_Упарадкаваць людзей па стане"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Стан"
 
@@ -2245,34 +2330,39 @@ msgid "All"
 msgstr "Усе"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "усе па падпісцы"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Дазволіць"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Адмовіць"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Парадак:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Спіс прыватнасці"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "усе па падпісцы"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "усе з групы"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2284,19 +2374,19 @@ msgstr ""
 "ад\n"
 "каму"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "адпраўляць мне паведамленні"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "адпраўляць мне запыты"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "адпраўляць мне паведамленні аб змене стану"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "бачыць мой стан"
 
@@ -2488,105 +2578,11 @@ msgstr "Выдаліць рахунак для Gajim і на _серверы"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "Вы_даліць"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Спытацца _дазволу праглядаць змены стану"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Дадаць спецыяльнае _нагадванне"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Прызначыць ключ Open_PGP"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "Змяніць _групы"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Выканаць загад..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "За_прасіць"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "Вы_даліць"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Адправіць асаблівы XML"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Адправіць _асобнае паведамленне..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "Адправіць _файл"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Пачаць _размову"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "Дазволіць чалавеку _бачыць змены майго стану"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Забараніць праглядаць змены майго стану"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "Змяніць імя чалавека"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "Змяніць _імя"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "П_адпіска"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "дзевяць"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2714,7 +2710,7 @@ msgid "_Add contact"
 msgstr "Дадаць _чалавека"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "Асабістыя звесткі"
@@ -2938,26 +2934,6 @@ msgstr "_Паведамленне"
 msgid "_Presence"
 msgstr "_Прысутнасць"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Дадаць спецыяльнае _нагадванне"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Прызначыць ключ Open_PGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Змяніць _групы"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "Змяніць _імя"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Змяніць рахунак..."
@@ -3002,48 +2978,48 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Актывізаваны"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Неактывізаваны"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Лагічнае"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Цэлы лік"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Тэкставае"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Колер"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Назва ўласцівасці"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Значэнне"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Тып"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Няма)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Схаваны"
 
@@ -3057,253 +3033,252 @@ msgstr "Вы атрымалі новае паведамленне:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Ангельская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Беларуская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Балгарская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Breton"
 msgstr "Брытонская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Чэшская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Нямецкая"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Грэцкая"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Брытанская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Эсперанта"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Іспанская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Basque"
 msgstr "Басцкая"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Французская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Харвацкая"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Італійская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Нарвежская (бокмал)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Галандская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Нарвежская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Польская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Партугальская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Бразільская партугальская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Расейская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Serbian"
 msgstr "Нямецкая"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Славацкая"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Шведская"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Кітайская (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Мова правапісу"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Няма злучэння"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Вы не можаце адпраўляць паведамленні без злучэння."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "дзевяць"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Мянушка"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Шрыфт:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Асабістыя звесткі"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Шыфраванне дзейнічае"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Няма ў спісе"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групавой размовы %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Аўтарызацыя"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Аўтарызацыя"
@@ -3311,101 +3286,58 @@ msgstr "Аўтарызацыя"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Загады: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Карыстанне: /%s, прыбірае тэкст у вакне."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Карыстанне: /%s, хавае кнопкі размовы."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Карыстанне: /%s <дзеянне>, выконвае дзеянне ў групавой размове (ад трэцяй "
-"асобы). (напр., /%s рагоча як конь.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr ""
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Карыстанне: /%s, хавае кнопкі размовы."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Даведка па /%s адсутнічае"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3413,22 +3345,22 @@ msgstr ""
 "Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае "
 "паведамленне згубіцца."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
@@ -3437,23 +3369,23 @@ msgstr "%(nick)s цяпер %(status)s"
 msgid "creating logs database"
 msgstr "стварэнне базы журналаў"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s з'яўляецца файлам, але павінна быць дырэкторыя"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim сканчвае работу"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "стварэнне дырэкторыі %s"
@@ -3517,9 +3449,9 @@ msgstr "Выберыце групавыя размовы, з якіх Вы хо�
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Групавыя размовы"
 
@@ -3537,70 +3469,111 @@ msgstr "%d нечытанае паведамленне"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Паказваць нагадванні праз DBus і Notification-Daemon"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Праз колькі хвілінаў змяняць стан на сышоўшы."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Сышоў як вынік марнавання часу"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Праз колькі хвілінаў змяняць стан на недаступны."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Недаступны ў выніку марнавання часу"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "тэкст паведамлення аб змене стану"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Няправільнае імя карыстальніка"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Змена мянушкі"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "тэкст паведамлення аб змене стану"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Спіс падзеленых прагаламі згорнутых рахункаў і групаў."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "Прадвызначана"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Дазволіць мясцовыя паведамленні"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Мова правапісу"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3610,7 +3583,7 @@ msgstr ""
 "'sometimes' - паказваць час кожныя print_ichat_every_foo_minutes хвілінаў.\n"
 "'never' - не паказваць час."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3621,18 +3594,18 @@ msgstr ""
 "паказвае самы прыблізны. Працуе, калі опцыя print_time мае значэнне "
 "'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Лічыць спалучэнні * / _  мажлівымі знакамі фарматавання."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Калі true, не выдаляць */_ . Такім чынам, *abc* будзе тлустым, але * * не "
 "выдаляецца."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3643,19 +3616,19 @@ msgstr ""
 "сінтаксіс на http://docutils.sourceforge.net/docs/ref/rst/restructuredtext."
 "html (калі Вы хочаце ўжыць гэтую магчымасць, усталюйце docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "Знак пасля дапоўненай мянушкі ў групавой размове."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr "Знак пасля вызначанай мянушкі, калі яе згадваюць у групавой размове."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3667,30 +3640,44 @@ msgstr ""
 "дакументацыі для python на функцыю strftime: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Знакі, якія друкуюцца ў вокнах размовы перад мянушкай"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Знакі, якія друкуюцца ў вокнах размовы пасля мянушкі"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Дадаць * і [n] у назву галоўнага вакна?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr ""
 "Колькі радкоў помніць з апошняй размовы, калі размова наноў адкрываецца."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колькі хвілінаў апошняй размовы паказваць у новых размовах."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3698,11 +3685,11 @@ msgstr ""
 "Адпраўляць паведамленне праз Ctrl+Enter, а Enter стварае новы радок "
 "(стандартныя паводзіны Mirabilis ICQ)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колькі радкоў захоўваць для Ctrl+KeyUP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3711,13 +3698,13 @@ msgstr ""
 "Альбо адмысловы адрас з %s, дзе %s ёсць словам/выразам, альбо 'WIKTIONARY', "
 "што значыць выкарыстанне Вікі-Слоўніка."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim можа кантралявацца з дапамогай gajim-"
 "remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3728,14 +3715,14 @@ msgstr ""
 "(для якіх опцыя listen_to_network_manager не выстаўленая ў False і якія "
 "сінхранізуюцца з глабальным станам) згодна з станам сеткавага злучэння."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3743,7 +3730,7 @@ msgstr ""
 "Паказваць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3751,11 +3738,11 @@ msgstr ""
 "Калі трэба паказваць час не для кожнага паведамлення "
 "(print_time==sometimes), паказваць яго кожныя x хвілінаў."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Пытацца пацверджання закрыцця групавой размовы."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3763,7 +3750,7 @@ msgstr ""
 "Заўсёды пытацца пацверджання закрыцця групавых размоў з гэтага спіса "
 "падзеленых прагаламі назваў групавых размоў."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3771,13 +3758,13 @@ msgstr ""
 "Ніколі не пытацца пацверджання закрыцця групавых размоў з гэтага спіса "
 "падзеленых прагаламі назваў групавых размоў."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3786,27 +3773,27 @@ msgstr ""
 "Вызначае вузел, якому мы адпраўляем файлы, у выпадку трансляцыі адрасоў / "
 "перанакіравання портаў."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "У стандарце IEC вызначана, што КіБ = 1024 байтаў, КБ = 1000 байтаў."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Нагадваць аб падзеях праз значку прасторы паведамленняў."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Паказваць картку, калі актыўная толькі адна размова?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Паказваць межы картак у вокнах размовы?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Паказваць кнопку закрыцця на картцы?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3814,18 +3801,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Спіс падзеленых кропкай з коскай слоў, якія трэба фарбаваць у групавых "
 "размовах."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3833,14 +3820,14 @@ msgstr ""
 "Калі true, Gajim сканчвае работу па націску кнопкі X вакна. Гэтае "
 "настаўленне ўлічваецца толькі разам з значкай прасторы паведамленняў."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Калі true, Gajim будзе пры запуску спраўджваць, ці з'яўляецца ён "
 "прадвызначанай Jabber-праграмай."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3848,17 +3835,17 @@ msgstr ""
 "Калі true, Gajim паказвае значку на кожнай картцы з нечытанымі "
 "паведамленнямі. У залежнасці ад тэмы, гэтая значка можа быць і анімаванай."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 msgstr "Калі true, Gajim паказвае стан у галоўным вакне для кожнага чалавека"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3867,13 +3854,13 @@ msgstr ""
 "чалавеку, хто не меў усталяванага аватара ў апошні сеанс, ці чый аватар "
 "надта стары."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr "Калі false, не паказваць паведамленні аб змене стану суразмоўцы."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3887,30 +3874,30 @@ msgstr ""
 "паказваць усе такія паведамленні. Калі опцыя выстаўленая ў \"in_and_out\", "
 "Gajim будзе паказваць толькі паведамленні аб сыходзе / ўваходзе суразмоўцы."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Фонавы колер для толькі ўвайшоўшых людзей."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Фонавы колер для толькі сышоўшых людзей."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Калі true, адноўленыя з папярэдняга сеанса паведамленні будуць мець меншы "
 "памер шрыфта."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Не паказваць аватар для транспарта."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Не паказваць галоўнае вакно на панэлі заданняў."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3920,7 +3907,7 @@ msgstr ""
 "вакном (звычайныя паводзіны ў бальшыні кіраўнікоў вокнаў) пры наяўнасці "
 "нягледжаных падзей."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3931,7 +3918,7 @@ msgstr ""
 "перастаць адпраўляць звесткі sha у групавыя размовы"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3951,32 +3938,32 @@ msgstr ""
 "адпраўляюцца ў асобныя вокны. Зважайце, што гэтыя змены будуць ужытыя толькі "
 "пасля перазапуску праграмы."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Калі false, не паказваць аватары ў вакне размовы."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Калі true, клавіша Escape закрывае картку / вакно."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Схаваць кнопкі групавой размовы."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Хавае банер у групавой размове"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Хавае банер у прыватнай размове"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Схаваць спіс удзельнікаў групавой размовы."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3984,28 +3971,28 @@ msgstr ""
 "У групавой размове не паказваць мянушку, калі папярэдняе паведамленне "
 "напісаў той самы чалавек."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Водступ пры шматмэтавым прызначэнні паведамлення."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Адправіць паведамленне і закрыць вакно"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Спіс колераў для фарбавання мянушак у групавой размове."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab пераходзіць у наступную картку, калі няма нечытаных паведамленняў."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4013,7 +4000,25 @@ msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
+"радок адключае гэтае вакно."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
+"радок адключае гэтае вакно."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -4023,7 +4028,7 @@ msgstr ""
 "Вы ўвайшлі з адмоўным прыярытэтам, Вы не будзеце атрымліваць паведамленняў "
 "ад Вашага сервера."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4031,7 +4036,7 @@ msgstr ""
 "Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
 "пароляў Gnome Keyring (калі ўсталяваны)."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4040,7 +4045,7 @@ msgstr ""
 "Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
 "пароляў Gnome Keyring (калі ўсталяваны)."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4048,7 +4053,7 @@ msgstr ""
 "Калі true, Gajim будзе паказваць у кантактным лісце колькасць падлучаных "
 "людзей і агульную колькасць у радках групаў і рахункаў."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4056,57 +4061,67 @@ msgstr ""
 "Можа мець значэнні 'chat', 'normal' альбо быць пустым. Калі не пустое, то "
 "лічыць усе ўваходныя паведамленні гэтага тыпу"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4114,68 +4129,79 @@ msgstr ""
 "Аўтаматычна змяняць прыярытэт згодна з станам. Прыярытэты выстаўленыя ў "
 "опцыях autopriority_*."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Калі false, не паказваць аватары ў вакне размовы."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Выпраўленне хібы Jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4183,125 +4209,125 @@ msgstr ""
 "Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
 "выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова праверкі правапісу"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "усе ці падзеленыя прагаламі станы"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ці 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ці ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Сон"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Хутка буду"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Хутка буду."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Ежа"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Ямо, пакіньце мне паведамленне."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Фільм"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Гляджу фільм."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Працую"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Працую."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Я на тэлефоне."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Сышоў"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Я цешуся з жыцця."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Я даступны."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Я магу размаўляць."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Хутка прыйду."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Мяне няма."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Не турбаваць."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Бывай!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4310,178 +4336,185 @@ msgstr ""
 "вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне "
 "ўтрымлівае Вашую мянушку."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "зялёны"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "садавіна"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "чалавек"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "мора"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Няправільны вузел"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Звесткі рэгістрацыі для транспарта %s не прыйшлі ў час"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Зарэгістравацца на %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Няправільны Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Такая мянушка не дазволеная: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вам забаронена казанне ў гэтай групавой размове."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Такой групавой размовы няма."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Стварэнне групавых размоў абмежаванае."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас няма ў спісе ўдзельнікаў."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Аўтарызацыя забраная"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "цяпер падпісаны на %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запыт адпіскі ад %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "цяпер адпісаны ад %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4491,253 +4524,239 @@ msgstr ""
 "Выдаліце яго з дапамогай адмысловай праграмы, напр., http://jru.jabberstudio."
 "org/"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Пароль OpenPGP не вызначаны"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Перадалучыцеся самастойна."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Няправільны адказ"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Праверце злучэнне, альбо паспрабуйце пазней."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Захаваць у: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Праверце злучэнне альбо паспрабуйце пазней"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Памылка аўтарызацыі з \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Праверце звесткі аўтарызацыі."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Памылка ў часе выдалення спіса прыватнасці"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4746,31 +4765,31 @@ msgstr ""
 "Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых "
 "злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Немагчыма адправіць пусты файл"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Гэтае паведамленне *зашыфраванае* (Гл.:JEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4779,30 +4798,40 @@ msgstr ""
 "Тэма: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Людзі"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Не атрымана з-за нябачнага стану"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Памылка злучэння"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Назіральнікі"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Транспарты"
 
@@ -4811,14 +4840,19 @@ msgid "Not in roster"
 msgstr "Няма ў спісе"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Файлы падтрымкі python для D-Bus адсутнічаюць на гэтым кампутары"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Немагчыма скарыстаць D-Bus для Gajim"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "Залежнасць ад pysqlite2 (aka python-pysqlite2) не выкананая. Выхад..."
@@ -4894,56 +4928,69 @@ msgid "eleven"
 msgstr "адзінаццаць"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s гадзінаў"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "пяць хвілінаў на %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "дзесяць хвілінаў на %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "чвэрць на %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "дваццаць хвілінаў на %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "дваццаць пяць хвілінаў на %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "палова на %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "без дваццаці пяці хвілінаў %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "без дваццаці хвілінаў %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "без чвэрці %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, fuzzy, python-format
 msgid "ten to %(1)s"
 msgstr "дзесяць хвілінаў на $s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "без пяці хвілінаў %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s гадзінаў"
 
@@ -5011,190 +5058,190 @@ msgstr "Няправільны знак у назве вузла."
 msgid "Invalid character in resource."
 msgstr "Няправільны знак у назве рэсурса."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Заняты"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Заняты"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "М_яне няма"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Магу размаўляць"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Магу размаўляць"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Тут"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Тут"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Злучэнне"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "Н_е тут"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Адключаны"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Адключаны"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Нябачны"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?чалавек у стане:Невядомы"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?чалавек у стане:Ёсць памылкі"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Ужо ёсць падпіскі:Няма"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Да"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Абодва"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Запыт (на падпіску):Няма"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Падпісацца"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Роля чалавека:Няма"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Мадэратары"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Мадэратар"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Удзельнікі"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Удзельнік"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Наведвальнікі"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Наведвальнік"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Уладальнік"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Адміністратар"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Удзельнік"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "сочыць за размовай"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "заняты чымсьці іншым"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "піша паведамленне..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "перастаў пісаць"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "закрыў вакно / картку размовы"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s кiБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5202,22 +5249,22 @@ msgstr[0] "Адправіць паведамленне"
 msgstr[1] "Адправіць паведамленне"
 msgstr[2] "Адправіць паведамленне"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5225,12 +5272,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5246,11 +5293,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "памылка: немагчыма прачытаць %s"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "перанос базы журналаў у індэкс"
 
@@ -5971,13 +6018,13 @@ msgid ""
 msgstr "Магчыма, Gajim ужо працуе. Перадача файлаў скасаваная."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5986,16 +6033,28 @@ msgstr ""
 "Вузел, вызначаны опцыяй ft_override_host_to_send, некарэктны, таму "
 "ігнаруецца."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Пароль OpenPGP не вызначаны"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Каб працягваць адпраўку і атрыманне паведамленняў, трэба перадалучыцца."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Памылка Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -6004,32 +6063,32 @@ msgstr ""
 "%s\n"
 "Мясцовыя паведамленні могуць не працаваць."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Праверце, ці ўсталяваны Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Немагчыма стартаваць мясцовы сервіс"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Немагчыма злучыцца праз порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Немагчыма змяніць стан рахунка \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -6037,21 +6096,21 @@ msgstr ""
 "Вы не злучаны альбо не бачны для іншых. Вы не можаце адправіць паведамленне."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Немагчыма злучыцца з вузлом: скончыўся тэрмін чакання."
@@ -6062,26 +6121,26 @@ msgstr "Немагчыма злучыцца з вузлом: скончыўся
 msgid "Error while adding service. %s"
 msgstr "Памылка дадання сервіса. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Адключана"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Стандартныя паведамленні стану"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Уключыць"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Слоўніка для мовы %s няма"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6090,209 +6149,215 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "загаловак паведамлення аб змене стану"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Перадалучыцца?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Нягледжаныя падзеі"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Прагледзьце нягледжаныя падзеі перад выдаленнем гэтага рахунка."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Вы пачалі размову ў рахунку %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Вы злучаны з серверам"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Каб змяніць назву рахунка, Вы павінны праглядзець усе нягледжаныя падзеі."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Назва рахунка не павінна быць пустой."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Назва рахунка не павінна ўтрымліваць прагалаў."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "Кіраванне рахункамі"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID павінны мець форму \"user@servername\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Немагчыма атрымаць сакрэтныя ключы"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Памылка пошуку Вашых сакрэтных ключоў OpenPGP."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Выбар ключоў OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Выберыце Ваш ключ OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Такога рахунка няма"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Вы павінны стварыць рахунак да рэдагавання асабістых звестак."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Вы не злучаны з серверам"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Немагчыма рэдагаваць асабістыя звесткі ў адлучаным рэжыме."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не падтрымлівае Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Сервер не можа захаваць Вашыя асабістыя звесткі."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Мясцовы рахунак Local ужо існуе."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Змяніць %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Зарэгістравацца на %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Чорны спіс"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Спіс удзельнікаў"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Спіс уладальнікаў"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Спіс адміністратараў"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Прычына"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Мянушка"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Забараніць казанне..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6300,11 +6365,11 @@ msgstr ""
 "<b>Каму Вы хочаце забараніць казанне?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Дадаць ўдзельніка..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6312,11 +6377,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць удзельнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Дадаць уладальніка..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6324,11 +6389,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць уладальнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Дадаць адміністратара..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6336,7 +6401,7 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць адміністратарам?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6353,129 +6418,128 @@ msgstr ""
 "4. domain (гэты домэн user@domain,\n"
 "domain/resource ці адрас паддамена)."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Выдаленне рахунка %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Захаваць пароль"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Калі Вы выдаліце яго, згубіцца злучэнне."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Усе"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Увайсці і выйсці"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:Няма"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Гэтая закладка мае няправільныя звесткі"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Запоўніце палі сервера і пакоя альбо выдаліце гэтую закладку."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Такая мянушка не дазволеная: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Рахунак паспяхова дададзены"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Вы можаце зараз змяніць адмысловыя настаўленні, націснуўшы кнопку "
 "\"Адмысловыя\", альбо пазней, выбраўшы элемент \"Рахункі\" ў меню \"Змяніць"
 "\" галоўнага вакна."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
 "рахунка."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Вызначце сваю новую мянушку:"
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6485,7 +6549,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6493,147 +6557,147 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Вы ўжо маеце рахунак з такой назваю."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Актыўны"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Падзея"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Атрыманае першае паведамленне"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Чалавек далучыўся"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Паведамленне адпраўленае"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Новы ліст GMail"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "Тэкст пад гэтай рысаю ёсць тэкстам, які Вы яшчэ не бачылі"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Выйсці"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дзеянні для \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Прачытаць артыкул у _Вікіпедыі"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Шукаць у _слоўніку"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "У адрасе слоўніка не хапае \"%s\", і гэта не Вікі-слоўнік"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адрасе пошуку ў Сеціве не хапае \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Шукаць у Сеціве"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Адкрыць _спасылку"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Учора"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i дзён таму"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тэма: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-праграма"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6669,128 +6733,128 @@ msgstr "Імя чалавека"
 msgid "Set Mood"
 msgstr "Вызначыць MOTD"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Паведамленне аб змене стану %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Захаваць гэтае паведамленне аб змене стану"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Вызначце назву гэтага паведамлення аб змене стану"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "Адрас AIM:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Нумар GG:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Нумар ICQ:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "Адрас MSN:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Адрас Yahoo!:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Запоўніце палі звесткамі пра чалавека, якога Вы хочаце дадаць у спіс рахунка "
 "%s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Няправільны ID карыстальніка"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "ID карыстальніка не павінны вызначаць рэсурс."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Гэты чалавек ужо ёсць у у кантактным лісце."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "ID карыстальніка:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Jabber-праграма для GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Актыўныя распрацоўнікі:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Былыя распрацоўнікі:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "Падзякі:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Таксама хочам выказаць падзяку ўсім людзям, што збіраюць пакункі з праграмай "
 "для розных сістэмаў."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6801,95 +6865,105 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запыт увагі на рахунак %s ад %s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запыт увагі ад %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы ўжо ўдзельнічаеце ў групавой размове %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Удзельнічаць у групавой размове праз рахунак %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Няправільная назва рахунка"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Няправільны Jabber ID групавой размовы"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Гэта не групавая размова"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не з'яўляецца сапраўднай назвай групавой размовы."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Пачаць размову з рахунка %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Пачаць размову"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6898,302 +6972,302 @@ msgstr ""
 "хочаце адправіць паведамленне:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Праверце злучэнне з \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Няправільны JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Немагчыма разабраць \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Няправільны пароль"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Вы павінны ўвесці пароль."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Паролі розняцца"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Чалавек прыйшоў"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Чалавек сышоў"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Новае паведамленне"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Новае асобнае паведамленне"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Новае прыватнае паведамленне"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Новы ліст"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Памылка перадачы файла"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Перадача файла скончаная"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спыненая"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Чалавек змяніў стан"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Асобнае паведамленне"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Адправіць %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Атрымана %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Я %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s сказаў:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Кансоль XML для %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Кансоль XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Адрас"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Змяніць"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Спіс прыватнасці <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Спіс прыватнасці для %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Парадак: %s, дзеянне: %s, тып: %s, значэнне: %s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Парадак: %s, дзеянне: %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Змяніць правіла</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Дадаць правіла</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Спісы прыватнасці для %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Спісы прыватнасці"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Няправільная назва спіса"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Вы павінны вызначыць назву для новага спіса прыватнасці."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Каментарый: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Выберыце гукавы файл"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Усе файлы"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Файлы Wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Выберыце малюнак"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Малюнкі"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Калі %s становіцца:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Дадаць асабістае нагадванне для %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "калі я "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7201,38 +7275,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7242,26 +7316,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7357,20 +7431,20 @@ msgstr "Апісанне"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Закладка ўжо ўсталяваная"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Закладка паспяхова дададзеная"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага "
@@ -7385,15 +7459,15 @@ msgstr "Падпісаны"
 msgid "Node"
 msgstr "Ніякі"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Новы допіс"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "Падп_ісацца"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Адпісацца"
 
@@ -7833,51 +7907,51 @@ msgstr "Gajim патрабуе запуску сервера X. Выхад..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim патрабуе PyGTK 2.6 альбо вышэйшай версіі"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim патрабуе PyGTK 2.6 альбо вышэйшай версіі для запуску. Выхад..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim патрабуе GTK 2.6 альбо вышэйшай версіі"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim патрабуе GTK 2.6 альбо вышэйшай версіі для запуску. Выхад..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ не падтрымлівае libglade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr "Выдаліце бібліятэку GTK+ і ўсталюйце найноўшую стабільную версію з %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Праверце, ці падтрымліваюць бібліятэкі GTK+ і PyGTK сродкі libglade."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim патрабуе PySQLite2 для запуску"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim патрабуе pywin32 для запуску"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7885,11 +7959,11 @@ msgid ""
 msgstr "Праверце, ці ўсталяваны Pywin32. Вы можаце сцягнуць яго з %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim ужо працуе"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7897,34 +7971,34 @@ msgstr ""
 "Gajim ужо працуе\n"
 "Усё роўна запусціць наноў?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Патрэбны пароль"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Вызначце пароль GPG для рахунка %s."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Няправільны пароль"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7934,165 +8008,171 @@ msgstr ""
 "Гэтая мянушка ўжо ўжытая альбо зарэгістраваная іншым чалавекам.\n"
 "Выберыце іншую мянушку:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Памылка злучэння"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "памылка адпраўкі %s ( %s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Запыт падпіскі"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Адпісацца"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s змяніў мянушку на %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы злучаны без выкарыстання ключа OpenPGP."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Пароль няправільны"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Пароль няправільны"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Больш не пытацца"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8101,12 +8181,12 @@ msgstr ""
 "Кіраўнік пароляў Gnomekeyring усталяваны, але няправільна выконваецца "
 "(магчыма, зменная асяроддзя выстаўленая няправільна)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новая пошта на %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8114,7 +8194,7 @@ msgstr[0] "%d новы ліст"
 msgstr[1] "%d новыя лісты"
 msgstr[2] "%d новых лістоў"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8124,92 +8204,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хоча адправіць Вам файл."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Выдаліць чалавека з спіса"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Памылка чытання файла:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Файл %(filename)s паспяхова атрыманы ад %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Для кожнага _паведамлення"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8217,15 +8297,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8236,63 +8316,63 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Злучэнне"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можаце ўдзельнічаць у групавой размове нябачным"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць настаўленні"
 
@@ -8326,12 +8406,13 @@ msgstr ""
 "друкуюцца на асобным радку"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "рахунак"
 
@@ -8356,9 +8437,9 @@ msgstr "стан"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "адзін з: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "паведамленне"
 
@@ -8375,23 +8456,47 @@ msgstr ""
 "рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Змяніць стан рахунка(ў)"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Прыяры_тэт:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "_Зарэгістраваць новы рахунак"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
+"рахункаў, якія \"сінхранізуюцца з глабальным станам\""
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Паказвае вакно, з якога Вы можаце адправіць паведамленне пэўнаму чалавеку"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Калі вызначана, то імя чалавека выбіраецца з спіса гэтага рахунка"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8401,29 +8506,29 @@ msgstr ""
 "рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без "
 "'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "змест паведамлення"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "ключ pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Калі вызначана, паведамленне будзе зашыфраванае адкрытым ключом"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "Калі вызначана, паведамленне будзе адпраўленае праз гэты рахунак"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8433,135 +8538,135 @@ msgstr ""
 "OpenPGP і рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', "
 "без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "тэма"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "тэма паведамлення"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Атрымаць падрабязныя звесткі пра чалавека"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID чалавека"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Атрымаць падрабязныя звесткі аб рахунку"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Назва рахунка"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Адправіць файл чалавеку"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Месца файла"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "Калі вызначана, файл будзе адпраўлены праз гэты рахунак"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Паказаць спіс усіх настаўленняў і іх значэнні"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Выстаўляе значэнне 'ключа' ў 'значэнне'"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ключ=значэнне"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'ключ' ёсць назваю настаўлення, 'значэнне' ёсць выстаўляемым значэннем"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Выдаляе ўласцівасць"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "назва выдаляемай уласцівасці"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запісвае бягучыя настаўленні Gajim у файл .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Выдаліць чалавека з спіса"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Дадаць чалавека ў спіс"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Дадаць новага чалавека для гэтага рахунка"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Вяртае бягучы стан (глабальны, калі не вызначаны рахунак)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Вяртае колькасць нечытаных паведамленняў"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Адкрыць вакно 'Пачаць размову'"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Пачаць размову для рахунка"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Адправіць асаблівы XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "Адправіць XML"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8569,77 +8674,77 @@ msgstr ""
 "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
 "адпраўлены на ўсе рахункі"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Апрацоўваць спасылкі xmpp:/"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "спасылка"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "змест паведамлення"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Увайсці ў размоўны пакой"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "пакой"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Пакой:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "мянушка"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Мянушка не знойдзеная: %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "пароль"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Паролі розняцца"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Не хапае аргумента \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8648,31 +8753,31 @@ msgstr ""
 "'%s' няма ў Вашым спісе.\n"
 "Калі ласка, вызначце рахунак для адпраўкі паведамлення."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "У Вас няма актыўнага рахунка"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s не знойдзены"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8681,7 +8786,7 @@ msgstr ""
 "Карыстанне: %s загад [аргументы]\n"
 "Загад ёсць адным з:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8690,7 +8795,7 @@ msgstr ""
 "Надта шмат аргументаў. \n"
 "Увядзіце \"%s help %s\" для падрабязнейшых звестак"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8699,7 +8804,7 @@ msgstr ""
 "Аргумент \"%s\" не вызначаны. \n"
 "Увядзіце \"%s help %s\" для падрабязных звестак"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Няправільная спасылка"
 
@@ -8729,314 +8834,174 @@ msgstr "Вы не можаце выдаліць актыўную тэму"
 msgid "Please first choose another for your current theme."
 msgstr "Спачатку актывізуйце іншую тэму."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы выйшлі з пакоя \"%s\", альбо \"%s\" сышоў."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Журнал размоў"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Злучэнне"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Адносіны: "
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s сышоў"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Мянушка не знойдзеная: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Для гэтай групавой размовы не вызначаная тэма размовы"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s запрошаныя ў %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Мянушка не знойдзеная: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Карыстанне: /%s <мянушка|JID> [прычына], забараняе JID-у казанне для гэтай "
-"групавой размовы. Мянушку парушальніка можна змясціць тут, калі яна не "
-"ўтрымлівае знака \"@\". Калі JID яшчэ ўдзельнічае ў групавой размове, ён "
-"таксама будзе выкінуты адтуль. Прагалы ў мянушках не падтрымліваюцца."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Карыстанне: /%s <мянушка>, адкрывае вакно прыватнай размовы з чалавекам."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Карыстанне: /%s [прычына], закрывае вакно / картку, паказаўшы вызначаную "
-"прычыну."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Карыстанне: /%s <JID> [прычына], запрашае JID паўдзельнічаць у гэтай "
-"групавой размове, з пазначанай прычынай запрашэння."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Карыстанне: /%s <пакой>@<сервер>[/мянушка], увайсці ў пакой room@server з "
-"вызначанай мянушкай."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Карыстанне: /%s <мянушка> [прычына], выкідае парушальніка з вызначанай "
-"мянушкай з групавой размовы з паказанай прычынай. Прагалы ў мянушках не "
-"падтрымліваюцца."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Карыстанне: /%s <мянушка> [паведамленне], адкрывае вакно прыватнай размовы і "
-"адпраўляе паведамленне чалавеку."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Карыстанне: /%s <мянушка>, змяняе Вашую мянушку ў гэтай групавой размове."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Карыстанне: /%s, хавае кнопкі групавой размовы."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Карыстанне: /%s [тэма], паказвае ці змяняе тэму групавой размовы."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Карыстанне: /%s <паведамленне>, адпраўляе паведамленне, не шукаючы іншых "
-"загадаў."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Карыстанне: /%s <мянушка>, змяняе Вашую мянушку ў гэтай групавой размове."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Змяненне тэмы"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Вызначце новую тэму:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Змена мянушкі"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Вызначце сваю новую мянушку:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Апісанне: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Пакаранне %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Вы можаце вызначыць прычыну:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Забарона казання для %s"
@@ -9111,6 +9076,15 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Захаваць малюнак як..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Новая групавая размова"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Я хачу дадаць Вас у мой кантактны ліст"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Немагчыма адшукаць базу дадзеных"
@@ -9195,53 +9169,62 @@ msgstr "Журнал размоў %s"
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s цяпер %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Памылка: %s"
+
+#: ../src/history_window.py:440
+msgid "Error"
+msgstr ""
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Цяперашні стан: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Цяперашні стан: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Вы не злучаны з серверам"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Размовы"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Групавыя размовы"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Прыватныя размовы"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Паведамленні"
 
@@ -9302,12 +9285,12 @@ msgstr "дзевяць"
 msgid "Retrieving profile..."
 msgstr "Чытанне профіля..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "Месца файла"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "Такой групавой размовы няма."
@@ -9315,7 +9298,7 @@ msgstr "Такой групавой размовы няма."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Немагчыма загрузіць малюнак"
 
@@ -9348,46 +9331,46 @@ msgstr ""
 "У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце "
 "абнавіць пазней."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Адпраўлены запыт на падпіску"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Аўтарызацыя забраная"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Вы ўдзельнічаеце ў некалькіх групавых размовах"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9395,28 +9378,28 @@ msgstr ""
 "Змяніўшы свой стан на нябачны, Вы такім чынам выйдзеце з гэтых групавых "
 "размоў. Вы сапраўды хочаце стаць нябачным?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Ёсць нечытаныя паведамленні"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9425,84 +9408,95 @@ msgstr ""
 "Вы зможаце прачытаць нечытаныя паведамленні толькі з уключаным вядзеннем "
 "журналаў размоў."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Вы павінны прачытаць іх перад выдаленнем гэтага транспарта."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспарт \"%s\" будзе выдалены"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Транспарты будуць выдаленыя"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэтыя транспарты: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Змяніць імя чалавека"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Вызначце новую мянушку для чалавека %s."
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Змяніць назву групы"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Выдаліць групу"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Таксама выдаліць усіх людзей з гэтай групы"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Прызначыць ключ OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Выберыце ключ для гэтага чалавека"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" будзе выдалены з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9511,12 +9505,12 @@ msgstr ""
 "прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9525,16 +9519,16 @@ msgstr ""
 "чынам таксама прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас "
 "адлучаным."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Людзі будуць выдаленыя з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9544,19 +9538,32 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Рахункаў няма"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9565,12 +9572,12 @@ msgstr ""
 "Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для "
 "наступных сеансаў."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9580,12 +9587,12 @@ msgstr ""
 "кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў "
 "Jabber альбо некалькі транспартных рахункаў."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Няправільны файл"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9593,12 +9600,12 @@ msgstr[0] "%s хоча адправіць Вам файл:"
 msgstr[1] "%s хоча адправіць Вам файл:"
 msgstr[2] "%s хоча адправіць Вам файл:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Адправіць %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Зрабіць %s і %s мета-кантактамі"
@@ -9608,123 +9615,134 @@ msgstr "Зрабіць %s і %s мета-кантактамі"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "выкарыстоўвае рахунак %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "рахунку %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "выкарыстоўвае рахунак %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Кіраванне закладкамі..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "рахунка %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "для рахунка %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Праглядзець сервісы..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Ад_правіць групавое паведамленне"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Усім карыстальнікам"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Усім актыўным карыстальнікам"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Я хачу дадаць Вас у мой кантактны ліст"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Змяніць імя чалавека"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Змяніць _групы"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ад_правіць асобнае паведамленне"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Выканаць загад..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Транспарты"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Паказаць _транспарты"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "Змяніць _імя"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "Новая групавая размова"
+msgid "_Disconnect"
+msgstr "Чалавек адлучыўся"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Кіраўнік журналаў"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Удзельнічаць у групавой размове"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Змяніць паведамленне стану..."
 
@@ -9741,20 +9759,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Тэма: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9764,7 +9782,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9952,6 +9970,130 @@ msgstr ""
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Дадаць спецыяльнае _нагадванне"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Прызначыць ключ Open_PGP"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Загады: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Карыстанне: /%s, прыбірае тэкст у вакне."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Карыстанне: /%s, хавае кнопкі размовы."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Карыстанне: /%s <дзеянне>, выконвае дзеянне ў групавой размове (ад трэцяй "
+#~ "асобы). (напр., /%s рагоча як конь.)"
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Карыстанне: /%s, хавае кнопкі размовы."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Даведка па /%s адсутнічае"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Дазволіць мясцовыя паведамленні"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Мянушка не знойдзеная: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Для гэтай групавой размовы не вызначаная тэма размовы"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s запрошаныя ў %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Мянушка не знойдзеная: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Карыстанне: /%s <мянушка|JID> [прычына], забараняе JID-у казанне для "
+#~ "гэтай групавой размовы. Мянушку парушальніка можна змясціць тут, калі яна "
+#~ "не ўтрымлівае знака \"@\". Калі JID яшчэ ўдзельнічае ў групавой размове, "
+#~ "ён таксама будзе выкінуты адтуль. Прагалы ў мянушках не падтрымліваюцца."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Карыстанне: /%s <мянушка>, адкрывае вакно прыватнай размовы з чалавекам."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Карыстанне: /%s [прычына], закрывае вакно / картку, паказаўшы вызначаную "
+#~ "прычыну."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Карыстанне: /%s <JID> [прычына], запрашае JID паўдзельнічаць у гэтай "
+#~ "групавой размове, з пазначанай прычынай запрашэння."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Карыстанне: /%s <пакой>@<сервер>[/мянушка], увайсці ў пакой room@server з "
+#~ "вызначанай мянушкай."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Карыстанне: /%s <мянушка> [прычына], выкідае парушальніка з вызначанай "
+#~ "мянушкай з групавой размовы з паказанай прычынай. Прагалы ў мянушках не "
+#~ "падтрымліваюцца."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Карыстанне: /%s <мянушка> [паведамленне], адкрывае вакно прыватнай "
+#~ "размовы і адпраўляе паведамленне чалавеку."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Карыстанне: /%s <мянушка>, змяняе Вашую мянушку ў гэтай групавой размове."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Карыстанне: /%s, хавае кнопкі групавой размовы."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr "Карыстанне: /%s [тэма], паказвае ці змяняе тэму групавой размовы."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Карыстанне: /%s <паведамленне>, адпраўляе паведамленне, не шукаючы іншых "
+#~ "загадаў."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Карыстанне: /%s <мянушка>, змяняе Вашую мянушку ў гэтай групавой размове."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Пстрыкніце, каб праглядзець спіс здольнасцяў jabber-сервераў (напр., "
diff --git a/po/be@latin.po b/po/be@latin.po
index b3ea59342..a32a33a58 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:41+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian Latin <i18n@mova.org>\n"
@@ -221,6 +221,7 @@ msgstr "<b>Asabistyja źviestki</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Kont"
 
@@ -288,8 +289,8 @@ msgstr "Źmiani asabistyja źviestki..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -300,8 +301,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Ahulnaja"
 
@@ -360,25 +361,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Źviestki pra ciabie, jakija zachoŭvajucca na servery"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Kluč nie abrany"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Nijaki"
 
@@ -535,8 +532,8 @@ msgstr ""
 "Taksama moža spatrebicca źmianić nałady firewalla."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "JID:"
 
@@ -550,7 +547,7 @@ msgid "Mer_ge accounts"
 msgstr "_Źlej konty ŭ adno"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "_Źmiani nazvu"
 
@@ -812,7 +809,7 @@ msgid "All statuses"
 msgstr "Usie statusy"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Adyjšoŭ"
 
@@ -829,7 +826,7 @@ msgid "Have "
 msgstr "Nie razmaŭlaju "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Niabačny"
 
@@ -838,7 +835,7 @@ msgid "Launch a command"
 msgstr "Vykanaj zahad"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Niedastupny"
 
@@ -1028,7 +1025,7 @@ msgid "Join _Group Chat"
 msgstr "Dałučysia da _pakoju"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "_Dadaj u śpis kantaktaŭ"
@@ -1055,65 +1052,154 @@ msgstr "_Adčyni spasyłku ŭ hartačy"
 msgid "_Start Chat"
 msgstr "_Pačni razmovu"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "_Zaprasi"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Naziralniki"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Spytaj _dazvołu bačyć jahony/jejny status"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Dadaj admysłovaje _nahadvańnie"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Pryznač kluč Open_PGP"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Vykanaj zahad..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Źmiani _hrupy"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "_Zaprasi"
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Kantakty"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Vydal"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Dasyłaje svoj XML"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Dašli _asobnaje aviedamleńnie..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "Vyšli _fajł"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Pačni _razmovu"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Dadaj u śpis kantaktaŭ"
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "Dazvol jamu/joj _bačyć moj status"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "Za_barani jamu/joj bačyć moj status"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "_Žurnał razmoŭ"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "_Zaprasi"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "Naziralniki"
+msgid "_Manage Contact"
+msgstr "Źmiani nazvu kantaktu"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "Źmiani _nazvu"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Aŭtaryzacyja"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "dziaviataja"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Zapoŭni formu."
@@ -1230,7 +1316,7 @@ msgstr ""
 "Kantakt\n"
 "Baner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Tłusty"
 
@@ -1254,7 +1340,7 @@ msgstr "Vyjšaŭ"
 msgid "Inactive"
 msgstr "Pasiŭny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Nachileny"
 
@@ -1333,6 +1419,14 @@ msgstr "Ma_deratar"
 msgid "Occupant Actions"
 msgstr "_Dziejańni haspadara"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Vyšli _fajł"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Dadaj u śpis kantaktaŭ"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administratar"
@@ -1341,13 +1435,6 @@ msgstr "_Administratar"
 msgid "_Ban"
 msgstr "Za_blakuj"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Vypchni"
@@ -1364,13 +1451,6 @@ msgstr "_Uładalnik"
 msgid "_Send Private Message"
 msgstr "_Dasłać pryvatnaje paviedamleńnie"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Daj hołas"
@@ -1379,7 +1459,7 @@ msgstr "_Daj hołas"
 msgid "Create new post"
 msgstr "Stvary novy zapis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Ad"
 
@@ -1410,8 +1490,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Kiraŭnik žurnałaŭ razmoŭ Gajim"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Vydal"
 
@@ -1457,34 +1537,39 @@ msgstr "Šukaj"
 msgid "_Log conversation history"
 msgstr "_Zachoŭvaj žurnał razmoŭ"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "_Stvary zakładku dla hetaja pakoju"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Dałučysia da pakoju"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Dałučajsia da hetaha pakoju aŭtamatyčna pry kožnym złučeńni"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Mianuška:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Parol:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Niadaŭna:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Pakoj:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Dałučysia"
@@ -1515,7 +1600,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Pakazvaj status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2075,7 +2160,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "_Paradkuj kantakty pa statusie"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2248,34 +2333,39 @@ msgid "All"
 msgstr "usim"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "pavodle aŭtaryzacyi"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Dazvol"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Admoŭ"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Paradak:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Śpis pryvatnaści"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "pavodle aŭtaryzacyi"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "pavodle hrupy"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2287,19 +2377,19 @@ msgstr ""
 "ad\n"
 "da"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "dasyłać mnie paviedamleńni"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "dasyłać mnie apytańni"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "dasyłać mnie paviedamleńni statusu"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "bačyć moj status"
 
@@ -2491,105 +2581,11 @@ msgstr "Vydal kont i dla Gajim, i na _servery"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Vydal"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Spytaj _dazvołu bačyć jahony/jejny status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Dadaj admysłovaje _nahadvańnie"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Pryznač kluč Open_PGP"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "Źmiani _hrupy"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Vykanaj zahad..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "_Zaprasi"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Vydal"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Dasyłaje svoj XML"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Dašli _asobnaje aviedamleńnie..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "Vyšli _fajł"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Pačni _razmovu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "Dazvol jamu/joj _bačyć moj status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "Za_barani jamu/joj bačyć moj status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "Źmiani nazvu kantaktu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "Źmiani _nazvu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Aŭtaryzacyja"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "dziaviataja"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2717,7 +2713,7 @@ msgid "_Add contact"
 msgstr "_Dadaj kantakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "Źviestki ab kantakcie"
@@ -2944,26 +2940,6 @@ msgstr "_Paviedamleńnie"
 msgid "_Presence"
 msgstr "P_rysutnaść"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Dadaj admysłovaje _nahadvańnie"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Pryznač kluč Open_PGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Źmiani _hrupy"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "Źmiani _nazvu"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Madyfikuj kont..."
@@ -3008,48 +2984,48 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Dziejny"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Niadziejny"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Lahičnaja źmiennaja"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Cely lik"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Koler"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Nazva nałady"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Vartaść"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Niama)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Schavany"
 
@@ -3063,251 +3039,250 @@ msgstr "Atrymaŭ novy zapis:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Anhielskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Biełaruskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Baŭharskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Breton"
 msgstr "Brytonskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Českaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Niamieckaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Hreckaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Brytanskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Hišpanskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Francuzkaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Charvackaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italijskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Narveskaja (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Halandzkaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Narveskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Partuhalskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brazilskaja partuhalskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Rasiejskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Serbskaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Słavackaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Švedzkaja"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Kitajskaja (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Mova spraŭdžvańnia pravapisu"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Złučeńnie niemahčymaje"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Ty nia možaš dasłać paviedamleńnie, pakul nia złučyśsia z serveram."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "dziaviataja"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Mianuška"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Šryft:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Šyfravańnie ŭklučanaje"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Niama ŭ śpisie"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pakoju %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
@@ -3315,101 +3290,58 @@ msgstr "Užyvaj aŭtaryzacyju"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Zahady: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Užyvańnie: /%s, ačyščaje akno ad tekstu."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Užyvańnie: /%s <dziejańnie>, dasyłaje dziejańnie ŭ dziejny pakoj (ad treciaj "
-"asoby). (naprykład, /%s rahoča, jak koń.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr ""
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Niama daviedki pa /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Tolki što atrymanaje paviedamleńnie ad \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3417,22 +3349,22 @@ msgstr ""
 "Kali ty začyniš hetuju kartku i kali žurnały nie vieducca, to hetaje "
 "paviedamleńnie źniknie nazaŭždy."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
@@ -3441,23 +3373,23 @@ msgstr "%(nick)s maje ciapier status %(status)s"
 msgid "creating logs database"
 msgstr "stvarajecca baza žurnałaŭ"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s jość fajłam, ale musiŭ być kataloh"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim zaviaršaje vykanańnie"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jość kataloham, ale musiŭ być fajł"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "stvarajecca kataloh %s"
@@ -3521,9 +3453,9 @@ msgstr "Zaznač pakoji, jakija chočaš pakinuć"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Pakoji"
 
@@ -3541,71 +3473,112 @@ msgstr "%d niečytanaje paviedamleńnie"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Pakazvaj nahadvańni z dapamohaj DBus i Notification-Daemon"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Adyjšoŭ\"."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Status \"Adyjšoŭ\" jak vynik biaździejnaści prahramy"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Niedastupny\"."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Status \"Niedastupny\" jak vynik biaździejnaści prahramy"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "tekst paviedamleńnia statusu"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Niapravilnaje imia karystalnika"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Źmianiajecca mianuška"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "tekst paviedamleńnia statusu"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Śpis (padzielenych prabiełami) zhornutych radkoŭ (kontaŭ i hrupaŭ)."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "Zmoŭčany"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Uklučy lakalnyja paviedamleńni praz Zeroconf"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Mova pravierki pravapisu"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3616,7 +3589,7 @@ msgstr ""
 "print_ichat_every_foo_minutes.\n"
 "'never' - nie pakazvaj času."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3626,18 +3599,18 @@ msgstr ""
 "adklučyć niedakładnaść. 1 akreślivaje samy dakładny čas, 4 akreślivaje samy "
 "niedakładny. Zadziejničana, kali opcyja print_time maje vartaść 'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znakaŭ * / _  jak znaki farmatavańnia."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Kali maje vartaść True, nie vydalaj */_ . Takim čynam *abc* budzie tłustym, "
 "ale i znaki * * nia vydalacca."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3649,14 +3622,14 @@ msgstr ""
 "rst/restructuredtext.html (Kali chočaš karystacca hetaj mahčymaściu, "
 "zainstaluj docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 "Znak, jaki dadajecca paśla mianuški pry dapaŭnieńni (klavišaj TAB) u pakoji."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3664,7 +3637,7 @@ msgstr ""
 "Znak, jaki dadajecca paśla mianuški, kali akreślenaja mianuška ŭžyvajecca ŭ "
 "movie inšaha ŭdzielnika pakoju."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3675,32 +3648,46 @@ msgstr ""
 "\". Hladzi padrabiaznyja źviestki ŭ dakumentacyi dla Pythonu pa funkcyi "
 "strftime: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaki, što pakazvajucca ŭ razmovie pierad mianuškaj"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaki, što pakazvajucca ŭ razmovie paśla mianuški"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Dadać * i [n] u zahałovak śpisu kantaktaŭ?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr ""
 "Kolki radkoŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym aknie."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Kolki chvilinaŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym "
 "aknie."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3708,11 +3695,11 @@ msgstr ""
 "Dasyłaj paviedamleńnie praz Ctrl+Enter, a Enteram stvaraj novy radok "
 "(zmoŭčanyja pavodziny Mirabilis ICQ)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolki radkoŭ zachoŭvać dla Ctrl+KeyUP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3721,12 +3708,12 @@ msgstr ""
 "Albo specyjalny adrasm jaki ŭtrymlivaje %s, dzie %s jość słovam/vyrazam, "
 "albo radok 'WIKTIONARY', što aznačaje vykarystańnie Wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajimam možna kiravać praz gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3738,14 +3725,14 @@ msgstr ""
 "maje vartaści False i jakija synchranizujucca z hlabalnym stanam) zhodna "
 "statusu sietkavaha złučeńnia."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3753,7 +3740,7 @@ msgstr ""
 "Pakazanyja nahadvańni stanu razmovy ŭ voknach. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3761,11 +3748,11 @@ msgstr ""
 "Kali čas pakazvajecca nie dla kožnaha paviedamleńnia "
 "(print_time==sometimes), pakazvaj jaho kožnyja x chvilinaŭ."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3773,7 +3760,7 @@ msgstr ""
 "Zaŭsiody pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
 "hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3781,13 +3768,13 @@ msgstr ""
 "Nikoli nie pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
 "hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3796,27 +3783,27 @@ msgstr ""
 "Nadpisvaje host, jaki vysyłajecca dla Pieradačy fajłaŭ, u vypadku tranślacyi "
 "adrasoŭ/pieranakiravańnia partoŭ."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Standart IEC vyznačaje, što KiB = 1024 bajtaŭ, KB = 1000 bajtaŭ."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Nahadvaj ab padziejach ikonaj pola nahadvańnia."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Pakazvać kartku, kali dziejnaja tolki adna razmova?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Pakazvać padzieł kartak u voknach razmovy?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Pakazvać knopki začynieńnia na kartkach?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3824,18 +3811,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Śpis padzielenych kropkaj z koskaj słovaŭ, jakija treba padśviatlać u "
 "pakojach."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3844,14 +3831,14 @@ msgstr ""
 "X Kiraŭnika voknaŭ. Hetaja nałada dziejničaje tolki ź dziejnaj ikonaj pola "
 "nahadvańnia."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie praviarać, ci akreśleny jon jak "
 "zmoŭčany klijent Jabber."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3860,7 +3847,7 @@ msgstr ""
 "niečytanymi paviedamleńniami. U zaležnaści ad matyvu, hetaja ikona moža być "
 "animavanaj."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3868,11 +3855,11 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim pakazvaje status kožnaha kantaktu, kali "
 "jon nie pusty, dla kožnaha elementu śpisu kantaktaŭ."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3881,7 +3868,7 @@ msgstr ""
 "kantaktu, jaki nia mieŭ avatara byłym razam, albo kali buferavany avatar "
 "sastareje."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3889,7 +3876,7 @@ msgstr ""
 "Kali opcyja maje vartaść False, Gajim nie budzie pakazvać radki stanu, kali "
 "surazmoŭca źmianiaje status i/ci paviedamleńnie statusu."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3904,30 +3891,30 @@ msgstr ""
 "vartaść \"in_and_out\", Gajim budzie pakazvać tolki paviedamleńni ab "
 "dałučeńni/adłučeńni surazmoŭcaŭ."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Fonavy koler kantaktaŭ, kali jany tolki dałučylisia."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Fonavy koler kantaktaŭ, kali jany tolki adłučylisia."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Kali opcyja maje vartaść True, adnoŭlenyja paviedamleńni buduć pakazvacca "
 "mienšym za zmoŭčany šryftam."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pakazvaj avatara dla transpartu."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pakazvaj śpis kantaktaŭ na paneli zadańniaŭ."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3937,7 +3924,7 @@ msgstr ""
 "albo paźniejšaj, mirhaj aknom (zmoŭčanyja pavodziny akna ŭ bolšaści "
 "Kiraŭnikoŭ voknaŭ) pry najaŭnaści niečytanych paviedamleńniaŭ."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3948,7 +3935,7 @@ msgstr ""
 "słać takija danyja SHA."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3968,34 +3955,34 @@ msgstr ""
 "pakazvajucca ŭ asobnych voknach. Zvažaj, što kab ubačyć źmieny, treba "
 "ŭruchomić Gajima nanoŭ."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Kali opcyja maje vartaść False, ty bolš nia ŭbačyš avatara ŭ aknie razmovy."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Kali opcyja maje vartaść True, nacisk klavišy Escape začyniaje kartku/akno."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Chavaje knopki ŭ aknie pakoju."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Chavaje baner u aknie pakoju"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Chavaje baner u aknie pryvatnaj razmovy"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Chavaje śpis naviednikaŭ pakoju."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -4003,29 +3990,29 @@ msgstr ""
 "U pakoji pakazvaj mianušku pierad paviedamleńniem, tolki kali jaho napisała "
 "nia taja asoba, što napisała papiaredniaje paviedamleńnie."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Vodstup pry šmatmetavym pryznačeńni paviedamleńnia."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Dašli paviedamleńnie i začyni akno"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Śpis koleraŭ dla farbavańnia mianušak u pakojach."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab pierachodzić na nastupnuju kartku, kali na dziejnaj niama "
 "niečytanych paviedamleńniaŭ."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4033,7 +4020,25 @@ msgstr ""
 "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
 "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
+"radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
+"radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -4043,7 +4048,7 @@ msgstr ""
 "madyfikacyi kontu. UHAVA: kali ty dałučajeśsia z admoŭnym pryjarytetam, to "
 "nia budzieš atrymvać paviedamleńniaŭ z servera."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4051,7 +4056,7 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie zachoŭvać paroli z dapamohaj "
 "Kiraŭnika parolaŭ GNOME (kali jość mahčymaść)."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4060,7 +4065,7 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie zachoŭvać paroli z dapamohaj "
 "Kiraŭnika parolaŭ GNOME (kali jość mahčymaść)."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4068,7 +4073,7 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie pakazvać kolkaść dałučanych "
 "kantaktaŭ i ahulnuju kolkaść kantaktaŭ u radkach kontaŭ i hrupaŭ."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4076,57 +4081,67 @@ msgstr ""
 "Moža być pustym albo mieć vartaść 'chat' ci 'normal'. Kali vartaść nie "
 "pustaja, traktuj usie ŭvachodnyja paviedamleńni jak paviedamleńni hetaha typu"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4134,68 +4149,80 @@ msgstr ""
 "Pryjarytet budzie aŭtamatyčna źmianiacca zhodna tvajmu statusu. Pryjarytety "
 "akreślivajucca ŭ opcyjach autopriority_*."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Kali opcyja maje vartaść False, ty bolš nia ŭbačyš avatara ŭ aknie razmovy."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Abychod dla Jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4203,125 +4230,125 @@ msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajim budzie pieradavać fajły z akreślenym "
 "adrasam IP i proxy-serveram z opcyi file_transfer_proxies."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Mova, dla jakoj treba praviarać pravapis"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "\"all\" albo statusy, padzielenyja prabiełami"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' albo 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' albo ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Splu"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Chutka viarnusia"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Viarnusia praz paru chvilinaŭ."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Hladžu film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Pracuju"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Ja pracuju."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Vyjšaŭ"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Vyjšaŭ ciešycca z žyćcia."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Dastupny."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Achvotna parazmaŭlaju."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Chutka viarnusia."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Niedastupny."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Nie turbavać."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Byvaj!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4329,178 +4356,185 @@ msgstr ""
 "Hukm jaki treba hrać, kali paviedamleńnie ŭ pakoji ŭtrymlivaje adno sa "
 "słovaŭ, akreślenych u opcyi muc_highlight_words, albo tvaju mianušku."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Huk, jaki treba hrać pry atrymańni novaha hrupavoha paviedamleńnia."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "zialony"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "bakaleja"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "čałaviek"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marski"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Niapravilny host"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Źviestki rehistracyi dla transpartu %s nie pryjšli ŭ čas"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Zarehistrujsia na %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Niapravilny JID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Mianuška nie dazvolenaja: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Ty zablakavany ŭ hetym pakoji."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Takoha pakoju niama."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Stvareńnie pakojaŭ abmiežavanaje."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "padpisany na %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zapyt adpiski ad %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ciapier adpisany ad %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4510,253 +4544,239 @@ msgstr ""
 "kantaktaŭ. Vydal jaho z dapamohaj pryłady kiravańnia śpisam kantaktaŭ, "
 "naprykład, http://jru.jabberstudio.org/"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Parol OpenPGP nia vyznačany"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Ty dałučyśsia da %s biaz OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Pieradałučysia samastojna."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Niapravilny adkaz"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Pravier złučeńnie albo pasprabuj paźniej."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Pravier złučeńnie albo paŭtary paźniej"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Pamyłka aŭtaryzacyi z \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Kali łaska, pravier pravilnaść loginu i parolu."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Pamyłka vydaleńnia śpisu pryvatnaści"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4765,31 +4785,31 @@ msgstr ""
 "Śpis pryvatnaści %s nia vydaleny. Jon vykarystoŭvajecca adnoj z dałučanych "
 "krynic. Adklučy jaje i paŭtary znoŭ."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Niemahčyma dasyłać pustyja fajły"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Hetaje paviedamleńnie *zašyfravanaje* (Hladzi :JEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4798,30 +4818,40 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kantakty"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Nia ściahnuta z-za niabačnaha statusu"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Niemahvyma dałučycca"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Naziralniki"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transparty"
 
@@ -4830,14 +4860,19 @@ msgid "Not in roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Nie staje fajłaŭ padtrymki Python dla D-Bus na hetym kamputary"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Niemahčyma vykarystać mahčymaści D-Bus dla Gajima"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "Nie staje pysqlite2 (python-pysqlite2) dla vykananaja. Vychad..."
@@ -4914,56 +4949,69 @@ msgid "eleven"
 msgstr "adzinaccataja"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s hadzinaŭ"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "piać chvilinaŭ na %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "dziesiać chvilinaŭ na %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "čverć na %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "dvaccać chvilinaŭ na %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "dvaccać piać chvilinaŭ na %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "pałova na %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "biez dvaccaci piaci chvilinaŭ %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "biez dvaccaci chvilinaŭ %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "biaz čverći %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, fuzzy, python-format
 msgid "ten to %(1)s"
 msgstr "bieź dziesiaci chvilinaŭ $s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "bieź piaci chvilinaŭ %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s hadzinaŭ"
 
@@ -5031,190 +5079,190 @@ msgstr "Niapravilny znak u naźvie hostu."
 msgid "Invalid character in resource."
 msgstr "Niapravilny znak u naźvie krynicy."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Zaniaty"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Zaniaty"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Niedastupny"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Achvotna parazmaŭlaju"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Dastupny"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Dastupny"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Dałučajusia"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "_Adyjšoŭ"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "Adł_učany"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Adłučany"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "N_iabačny"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?kantakt maje status:Nieviadomy"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?kantakt maje status:Jość pamyłki"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Najaŭnaja aŭtaryzacyja:Niama"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Dvuchbakovaja"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Zapyt (aŭtaryzacyi):Niama"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Aŭtaryzuj"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Maderatary"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Maderatar"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Udzielniki"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Udzielnik"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Naviedniki"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Naviednik"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Ułaśnik"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administratar"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Udzielnik"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "sočyć za razmovaj"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "robić štości inšaje"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "piša paviedamleńnie..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "pierastaŭ pisać"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "začyniŭ akno/kartku razmovy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5222,22 +5270,22 @@ msgstr[0] "Dašli paviedamleńnie"
 msgstr[1] "Dašli paviedamleńnie"
 msgstr[2] "Dašli paviedamleńnie"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5245,12 +5293,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5266,11 +5314,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "pamyłka: niemahčyma adčynić %s, kab adčytać"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "indeksavańnie bazy razmoŭ"
 
@@ -5992,13 +6040,13 @@ msgstr ""
 "Mahčyma, inšaja kopija Gajim užo vykonvajecca. Pieradača fajłaŭ anulavanaja."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -6007,15 +6055,27 @@ msgstr ""
 "Host, akreśleny ŭ opcyi ft_override_host_to_send, niapravilny, tamu "
 "ihnarujecca."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Parol OpenPGP nia vyznačany"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Ty dałučyśsia da %s biaz OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Kab paciahnuć kamunikacyju, treba ŭruchomić Gajim nanoŭ."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Pamyłka Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -6024,53 +6084,53 @@ msgstr ""
 "%s\n"
 "Lakalnyja paviedamleńni mohuć pracavać pamyłkova."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kali łaska, pravier instalacyju Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Niemahčyma ŭruchomić lakalny servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Niemahčyma dałučycca da portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Niemahčyma źmianić status kontu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr "Ty nie dałučany albo niebačny. Ty nia možaš dasyłać paviedamleńni."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6083,26 +6143,26 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Pamyłka dadańnia servisu. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Adklučana"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Ukluč"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Słoŭnik dla movy %s niedastupny"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6111,209 +6171,215 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "zahałovak statusu"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "tekst paviedamleńnia statusu"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Nazva"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Pieradałučycca?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Kali chočaš zadziejničać źmieny, treba pieradałučycca."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Nielha vykarystać OpenPGP na hetym kamputary"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Niepračytanyja paviedamleńni"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Pračytaj usie novyja paviedamleńni pierad vydaleńniem kontu."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Akno razmovy adčynienaje dla kontu %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Usie adčynienyja vokny razmovy buduć začynienyja. Praciahnuć?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Prahrama dałučanaja da servera"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "Kab źmianić nazvu kontu, treba pračytać usie novyja paviedamleńni."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Taki kont užo zaniaty"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Niapravilnaja nazva kontu"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Nazva kontu nia moža być pustoj."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Nazva kontu nia moža ŭtrymlivać prabiełaŭ."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kiruj kontami"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "JID musić mieć formu \"user@servername\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Abrany port musić być numeram portu."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Niemahčyma atrymać sakretnyja klučy"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Adbyłasia pamyłka ŭ časie atrymańnia sakretnych klučoŭ OpenPGP."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Vybar kluča OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Abiary svoj kluč OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Takoha kontu niama"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Treba stvaryć kont, kab redahavać asabistyja źviestki."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Niama złučeńnia z serveram"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Nie złučyŭšysia z serveram, niemahčyma źmianiać asabistyja źviestki."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Server nie padtrymvaje Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Server nia moža zachoŭvać asabistyja źviestki."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Kont Local užo isnuje."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Kali łaska, źmiani nazvu albo vydal jaho pierad uklučeńniem miascovych "
 "paviedamleńniaŭ."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Źmiani %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Zarehistrujsia na %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Śpis zablakavanych kantaktaŭ"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Śpis udzielnikaŭ"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Śpis ułaśnikaŭ"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Śpis administrataraŭ"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Pryčyna"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Mianuška"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Funkcyja"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Blakavańnie..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6321,11 +6387,11 @@ msgstr ""
 "<b>Kaho chočaš zablakavać?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Dadajecca ŭdzielnik..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6333,11 +6399,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić udzielnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Dadajecca ŭłaśnik..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6345,11 +6411,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić ułaśnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Dadajecca administratar..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6357,7 +6423,7 @@ msgstr ""
 "<b>Kaho chočaš zrabić administrataram?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6374,58 +6440,58 @@ msgstr ""
 "4. damen (adpaviadaje damen, jak karystalnik@damen,\n"
 "damen/krynica ci paddamen)."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Vydalajecca kont %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Vymahaje parolu"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Uviadzi parol dla kontu %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Zachavaj parol"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Kali ty vydališ jaho, złučeńnie razarviecca."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Zmoŭčany"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Usie"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Tolki ŭvachod i vychad"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:Niama"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Hetaja zakładka źmiaščaje niapravilnyja źviestki"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6433,69 +6499,68 @@ msgstr ""
 "zakładku."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Mianuška nie dazvolenaja: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Kont paśpiachova dadany"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Možaš źmianić dadatkovyja nałady kontu, nacisnuŭšy zaraz knopku \"Dadatkovyja"
 "\", albo paźniej, abraŭšy \"Źmianić\"->\"Konty\" ŭ menu hałoŭnaha akna."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Novy kont paśpiachova stvorany"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Treba vyznačyć imia karystalnika, kab skanfihuravać hety kont."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6505,7 +6570,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6513,72 +6578,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Adbyłasia pamyłka padčas stvareńnia kontu"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Nazva kontu ŭžo vykarystoŭvajecca"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Kont z takoj nazvaj užo isnuje."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Dziejny"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Padzieja"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Atrymanaje pieršaje paviedamleńnie"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Paviedamleńnie dasłanaje"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Novaje paviedamleńnie ŭ pakoji"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Novy list na skryncy GMail"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6587,75 +6652,75 @@ msgstr ""
 "Tekst pad hetaj rysaj addzialaje toj tekst, jaki ty jašče nia bačyŭ/nia "
 "bačyła"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Skonč pracu"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Dziejańni dla \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Pračytać artykuł u _Wikipedii"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Šukaj u _słoŭniku"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "U adrasie słoŭnika nie staje \"%s\", i heta nia Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "U adrasie dla web-pošuku nie staje \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Šukaj u Web"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Adčyni jak _spasyłku"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Učora"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i dzion tamu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Klijent kamunikacyi dla Jabber"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6691,125 +6756,125 @@ msgstr "Nazva kantaktu"
 msgid "Set Mood"
 msgstr "Vyznač MOTD"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Paviedamleńnie statusu %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Zapišy jak šablon paviedamleńnia statusu"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Kali łaska, uviadzi nazvu dla hetaha paviedamleńnia statusu"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "Adras AIM:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "Adras MSN:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Adras Yahoo!:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Kali łaska, zapoŭni źviestki ab kantakcie, kali chočaš dadać kantakt %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Kali łaska, zapoŭni źviestki ab kantakcie, jaki chočaš dadać"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Niapravilny identyfikatar karystalnika"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "Identyfikatar karystalnika nia moža ŭtrymlivać krynicy."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Hety kantakt užo jość u tvajim śpisie kantaktaŭ."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Identyfikatar karystalnika:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Jabber-klijent dla GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Versija GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Versija PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Dziejnyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Byłyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "PADZIAKI:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "I ŭrešcie, chočacca padziakavać usim apiekunam pakietaŭ."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6820,95 +6885,105 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zapyt aŭtaryzacyi dla kontu %s ad %s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zapyt aŭtaryzacyi ad %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Užo ŭdzielničaješ u razmovie ŭ pakoji %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dałučysia da pakoju dla kontu %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Niapravilnaja nazva kontu"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Treba stvaryć kont, kab razmaŭlać ź inšymi kantaktami."
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Niapravilny JID pakoju"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Heta nie pakoj"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Naźvie %s nie adpaviadaje nivodny pakoj."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Pačni razmovu dla kontu %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Pačni razmovu"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6917,303 +6992,303 @@ msgstr ""
 "paviedamleńnie:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Złučeńnia niama"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kali łaska, pravier, ci jość złučeńnie z \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Niapravilny JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Niemahčyma razabrać \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Niapravilny parol"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Treba ŭvieści parol."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Paroli roźniacca"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kantakt adłučyŭsia"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Novaje paviedamleńnie"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Novaje asobnaje paviedamleńnie"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Novaje pryvatnaje paviedamleńnie"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Novy list"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Pieradača fajłu skončana"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kantakt źmianiŭ status"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Asobnaje paviedamleńnie"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Dašli %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Atrymana %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Я %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisaŭ:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kansol XML dla %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Kansol XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Adras"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Madyfikuj"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "JID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Hrupa"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Śpis pryvatnaści <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Śpis pryvatnaści dla %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Paradak: %s, dziejańnie: %s, typ: %s, vartaść: %s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Paradak: %s, dziejańnie: %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redahuj praviła</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dadaj praviła</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Śpisy pryvatnaści dla %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Śpisy pryvatnaści"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Niapravilnaja nazva śpisu"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Treba akreślić nazvu dla novaha śpisu pryvatnaści."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Kamentar: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Abiary hukavy fajł"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Usie fajły"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Fajły ŭ Wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Abiary vyjavu"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Vyjavy"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kali %s maje status:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Umova"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "kali maju "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7221,38 +7296,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7262,26 +7337,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7376,20 +7451,20 @@ msgstr "Apisańnie"
 msgid "Id"
 msgstr "Identyfikatar"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Zakładka ŭžo dadana"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka paśpiachova dadanaja"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Možaš kiravać svajimi zakładkami praz menu \"Dziejańni\" śpisu kantaktaŭ."
@@ -7403,15 +7478,15 @@ msgstr "Aŭtaryzavany"
 msgid "Node"
 msgstr "Nijaki"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Novy zapis"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Aŭtaryzuj"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Anuluj aŭtaryzacyju"
 
@@ -7853,31 +7928,31 @@ msgstr "Gajimu patrebny X-server. Vychad..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajimu treba PyGTK 2.6 albo paźniejšaj versii"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajimu treba PyGTK 2.6 albo paźniejšaj versii. Vychad..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajimu treba GTK 2.6 albo paźniejšaj versii"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajimu treba GTK 2.6 albo paźniejšaj versii. Vychad..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Biblijateka GTK+ nie padtrymvaje libglade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7886,22 +7961,22 @@ msgstr ""
 "Kali łaska, vydal biblijateku GTK+ i zainstaluj najnoŭšuju stabilnuju "
 "versiju z %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Kali łaska, pravier, ci padtrymvajuć srodki libpango biblijateki GTK+ i "
 "PyGTK."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajimu treba PySQLite2"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajimu treba pywin32"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7911,11 +7986,11 @@ msgstr ""
 "ściahnuć z %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim užo vykonvajecca"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7923,34 +7998,34 @@ msgstr ""
 "Gajim užo vykonvajecca\n"
 "Usio adno ŭruchomić?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Musiš vyznačyć parol"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Vyznač parol GPG dla kontu %s."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Ty dałučyśsia da %s biaz OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Niapravilny parol"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7960,166 +8035,172 @@ msgstr ""
 "Hetaja mianuška vykarystoŭvajecca ci zarehistravanaja na inšuju asobu.\n"
 "Kali łaska, vyznač inšuju mianušku nižej:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Prymaješ hety zapyt?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prymaješ hety zapyt?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Aŭtaryzacyja HTTP (%s) dla %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "pamyłka dasyłańnia %s ( %s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Zapyt aŭtaryzacyi"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Aŭtaryzacyja pryniataja"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 "Kantakt \"%s\" aŭtaryzavaŭ ciabie, i ciapier ty možaš bačyć jaho status."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kantakt \"%s\" anulavaŭ tvaju aŭtaryzacyju"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s ciapier viadomy jak %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Treba ŭvieści parol, kab dałučycca da pakoju."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Dałučany biez kluča OpenPGP."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Parol niapravilny"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Parol niapravilny"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Bolš nie pytajsia"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8128,12 +8209,12 @@ msgstr ""
 "Kiraŭnik parolaŭ GNOME instalavany, ale niapravilna vykonvajecca (mahčyma, "
 "źmiennaja asiarodździa niapravilna akreślenaja)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novaja pošta ŭ skryncy %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8141,7 +8222,7 @@ msgstr[0] "%d novy list"
 msgstr[1] "%d novyja listy"
 msgstr[2] "%d novych listoŭ"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8151,92 +8232,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s choča dasłać tabie fajł."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Atrymany fajł %(filename)s ad %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Fajł %(filename)s paśpiachova dasłany da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Dla kožnaha _paviedamleńnia"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Kali łaska, akreśli novaje imia karystalnika dla lakalnaha kontu"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8244,15 +8325,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8263,63 +8344,63 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Złučeńnie"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Niemahčyma dałučycca da pakoju, kali ty niabačny"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
 
@@ -8353,12 +8434,13 @@ msgstr ""
 "kantakcie źjaŭlajucca na novym radku"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "kont"
 
@@ -8383,9 +8465,9 @@ msgstr "status"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "adno z: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "paviedamleńnie"
 
@@ -8403,22 +8485,47 @@ msgstr ""
 "statusam\""
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Źmianiaje status kontu albo kontaŭ"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Pryjary_tet:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Ja chaču za_rehistravać novy kont"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"źmiani status kontu \"kont\". Kali nie akreślena, pasprabuj źmianić statusy "
+"dla ŭsich kontaŭ, dla jakich vystaŭlenaja opcyja \"Synchranizuj z hlabalnym "
+"statusam\""
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Pakazvaje akno razmovy, kab dasyłać paviedamleńni kantaktu"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kantaktu, ź jakim chočaš parazmaŭlać"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Kali akreślena, kantakt biarecca sa śpisu kantaktaŭ hetaha kontu"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8428,30 +8535,30 @@ msgstr ""
 "kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki 'kont', "
 "biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "źmiest paviedamleńnia"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "kluč pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "Kali akreślena, paviedamleńnie budzie zašyfravana hetym publičnym klučom"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "Kali akreślena, paviedamleńnie budzie dasłanaje z hetaha kontu"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8461,136 +8568,136 @@ msgstr ""
 "OpenPGP i kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki "
 "'kont', biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema paviedamleńnia"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID kantaktu"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nazva kontu"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Dasyłaje kantaktu fajł"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fajł"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Ściežka da fajłu"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "Kali akreślena, fajł budzie dasłany z hetaha kontu"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Pakazvaje ŭsie nałady i ichnyja vartaści"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Akreślivaje dla 'kluča' 'vartaść'"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "kluč=vartaść"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'kluč' jość nazvaj nałady, 'vartaść' jość vartaściu hetaj nałady"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Vydalaje naładu"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "kluč"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nazva vydalenaj nałady"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisvaje dziejnyja nałady Gajima ŭ fajł .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Dadaje kantakt u śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Dadaje novy kantakt dla hetaha kontu"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Viartaje dziejny status (hlabalny, kali nie akreśleny kont)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Viartaje dziejnaje paviedamleńnie statusu (hlabalnaha, kali nie akreśleny "
 "kont)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Viartaje kolkaść niečytanych paviedamleńniaŭ"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Adčyniaje akno 'Pačni razmovu'"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Pačynaje razmovu dla hetaha kontu"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Dasyłaje svoj XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML dla dasyłańnia"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8598,77 +8705,77 @@ msgstr ""
 "Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
 "dasłany na ŭsie konty"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Absłuhoŭvaj spasyłki xmpp:/"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "źmiest paviedamleńnia"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Dałučysia da pakoju"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "pakoj"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Pakoj:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "mianuška"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Mianuška nia znojdziena: %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "parol"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Paroli roźniacca"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Nie staje arhumenta \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8677,31 +8784,31 @@ msgstr ""
 "'%s' niama ŭ tvajim śpisie kantaktaŭ.\n"
 "Kali łaska, akreśli kont dla dasyłańnia paviedamleńnia."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Nivodny kont nia dziejny"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Arhumenty:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s nia znojdzieny"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8710,7 +8817,7 @@ msgstr ""
 "Užyvańnie: %s zahad [arhumenty]\n"
 "Zahadam moža być adzin z nastupnych vyrazaŭ:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8719,7 +8826,7 @@ msgstr ""
 "Nadta šmat arhumentaŭ. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8728,7 +8835,7 @@ msgstr ""
 "Arhument \"%s\" nie akreśleny. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Niapravilnaja spasyłka"
 
@@ -8758,315 +8865,174 @@ msgstr "Niemahčyma vydalić dziejnuju temu"
 msgid "Please first choose another for your current theme."
 msgstr "Kali łaska, zadziejničaj spačatku inšuju temu."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Pamyłka dasyłańnia pryvatnaha paviedamleńnia"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Ciabie niama ŭ pakoji \"%s\", albo \"%s\" pakinuŭ jaho."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Ustaŭ mianušku"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Žurnał razmoŭ"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Złučeńnie"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s zablakavany: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s zablakavaŭ %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Suviaź: "
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s vyjšaŭ"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Mianuška nia znojdziena: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Dla hetaha pakoju nie akreślena tema"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s zaprošany ŭ %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Mianuška nia znojdziena: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Užyvańnie: /%s <mianyška|JID> [pryčyna], blakuje JID dla pakoju. Mianušku "
-"možna źmianić, kali jana nia ŭtrymlivaje znaka \"@\". Kali JID jašče "
-"znachodzicca ŭ pakoji, jon budzie vypchnuty preč. Prabieły ŭ mianuškach nie "
-"padtrymvajucca."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Užyvańnie: /%s <mianuška>, adčyniaje akno pryvatnaj razmovy z akreślenaj "
-"asobaj."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Užyvańnie: /%s [pryčyna], začyniaje dziejnaje akno albo kartku, pakazaŭšy "
-"akreślenuju pryčynu."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Užyvańnie: /%s <JID> [pryčyna], zaprašaje JID u dziejny pakoj, z akreślenym "
-"tłumačeńniem."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Užyvańnie: /%s <pakoj>@<server>[/mianuška], dałučajecca da pakoju "
-"pakoj@server z akreślenaj mianuškaj."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Užyvańnie: /%s <mianuška> [pryčyna], vypichvaje asobu z takoj mianuškaj z "
-"pakoju z akreślenaj pryčynaj. Prabieły ŭ mianuškach nie padtrymvajucca."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Užyvańnie: /%s <mianuška> [paviedamleńnie], adčyniaje akno pryvatnaj razmovy "
-"i dasyłaje paviedamleńnie asobie z akreślenaj mianuškaj."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Užyvańnie: /%s <mianuška>, źmianiaje tvaju mianušku dla dziejnaja pakoju."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Užyvańnie: /%s, pakazvaje imiony naviednikaŭ pakoju."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Užyvańnie: /%s [tema], pakazvaje albo aktualizuje dziejnuju temu pakoju."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Užyvańnie: /%s <paviedamleńnie>, dasyłaje paviedamleńnie, nie šukajučy "
-"inšych zahadaŭ."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Užyvańnie: /%s <mianuška>, źmianiaje tvaju mianušku dla dziejnaja pakoju."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Kali začyniš hetaje akno, adłučyśsia ad pakoju."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Źmianiajecca tema"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Kali łaska, vyznač novuju temu:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Źmianiajecca mianuška"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Apisańnie: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Vypichvajecca %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Možaš akreślić pryčynu nižej:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Blakavańnie %s"
@@ -9139,6 +9105,15 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Zapišy vyjavu jak..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Novaja hrupavaja razmova"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Niemahčyma znajści bazu žurnałaŭ razmoŭ"
@@ -9222,53 +9197,62 @@ msgstr "Žurnał razmoŭ z %s"
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s maje ciapier status %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Tekst pamyłki: %s"
+
+#: ../src/history_window.py:440
+msgid "Error"
+msgstr ""
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Dziejny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Dziejny status: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Niama złučeńnia z serveram"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Razmovy"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Pakoji"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Pryvatnyja razmovy"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Paviedamleńni"
 
@@ -9329,12 +9313,12 @@ msgstr "dziaviataja"
 msgid "Retrieving profile..."
 msgstr "Atrymańnie profilu..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "Ściežka da fajłu"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "Takoha pakoju niama."
@@ -9342,7 +9326,7 @@ msgstr "Takoha pakoju niama."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Niemahčyma adčytać vyjavu"
 
@@ -9374,46 +9358,46 @@ msgid ""
 msgstr ""
 "Adbyłasia pamyłka padčas publikacyi asabistych źviestak, pasprabuj paźniej."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Abjadnanyja konty"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ciapier \"%s\" budzie viedać tvoj status."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Zapyt aŭtaryzacyi dasłany"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Kali \"%s\" zadavolić tvoj zapyt, ty zmožaš bačyć jahony status."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ciapier \"%s\" budzie zaŭsiody bačyć ciabie jak adłučanaha."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Ty znachodziśsia ŭ adnym ci niekalkich pakojach"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9421,28 +9405,28 @@ msgstr ""
 "Źmianiŭšy status na niabačny, ty adłučyśsia ad hetych pakojaŭ. Ty sapraŭdy "
 "chočaš stać niabačnym?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Jość niečytanyja paviedamleńni"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9451,16 +9435,16 @@ msgstr ""
 "Paviedamleńni možna budzie pračytać paźniej, kali ŭklučana viadzieńnie "
 "žurnałaŭ razmoŭ."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Musiš pračytać ich pierad vydaleńniem hetaha transpartu."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transpart \"%s\" budzie vydaleny"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9468,11 +9452,11 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetym "
 "transpartam."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transparty buduć vydalenyja"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9481,58 +9465,69 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetymi "
 "transpartami:%s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Vyznač novuju mianušku dla kantaktu %s."
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Źmiani nazvu hrupy"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Vydal hrupu"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chočaš vydalić hrupu %s sa śpisu kantaktaŭ?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Vydal taksama ŭsie kantakty z hetaj hrupy sa śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Pryznač kluč OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Abiary kluč dla hetaha kantaktu"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kantakt \"%s\" budzie vydaleny z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9541,12 +9536,12 @@ msgstr ""
 "jon zaŭsiody budzie bačyć ciabie adłučanym."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Što chočaš zrabić?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9554,16 +9549,16 @@ msgstr ""
 "Vydaliŭšy hety kantakt, ty zmoŭčana taksama anuluješ jahonuju aŭtaryzacyju. "
 "U vyniku jon zaŭsiody budzie bačyć ciabie adłučanym."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Ja chaču, kab hety kantakt moh bačyć moj status paśla vydaleńnia"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kantakty buduć vydalenyja z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9573,19 +9568,32 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Konty niedastupnyja"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Treba stvaryć kont, kab razmaŭlać ź inšymi kantaktami."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9594,12 +9602,12 @@ msgstr ""
 "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ. Tamu hetyja źviestki "
 "nia buduć dastupnyja pry nastupnym złučeńni."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9609,12 +9617,12 @@ msgstr ""
 "Zvyčajna hetaja mažlivaść vykarystoŭvajecca, kali adzin čałaviek "
 "karystajecca niekalkimi kontami Jabber albo niekalkimi kontami z transpartaŭ."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Niapravilny fajł"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9622,12 +9630,12 @@ msgstr[0] "%s choča dasłać tabie fajł:"
 msgstr[1] "%s choča dasłać tabie fajł:"
 msgstr[2] "%s choča dasłać tabie fajł:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Dašli %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Zrabi z %s i %s metakantakt"
@@ -9637,123 +9645,134 @@ msgstr "Zrabi z %s i %s metakantakt"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "praz kont %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "da kontu %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "praz kont %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Kiruj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "kontu %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "dla kontu %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Šukaj servisy..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "_Dašli hrupavoje paviedamleńnie"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Usim karystalnikam"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Usim dałučanym karystalnikam"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Źmiani _hrupy"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Dašli asobnaje paviedamleńnie"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Vykanaj zahad..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transparty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Pakažy _transparty"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "Źmiani _nazvu"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "Novaja hrupavaja razmova"
+msgid "_Disconnect"
+msgstr "Kantakt adłučyŭsia"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Dałučysia da pakoju"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Źmiani paviedamleńnie statusu..."
 
@@ -9770,20 +9789,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9793,7 +9812,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9983,6 +10002,131 @@ msgstr ""
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Dadaj admysłovaje _nahadvańnie"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Pryznač kluč Open_PGP"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Zahady: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Užyvańnie: /%s, ačyščaje akno ad tekstu."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Užyvańnie: /%s <dziejańnie>, dasyłaje dziejańnie ŭ dziejny pakoj (ad "
+#~ "treciaj asoby). (naprykład, /%s rahoča, jak koń.)"
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Niama daviedki pa /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Uklučy lakalnyja paviedamleńni praz Zeroconf"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Mianuška nia znojdziena: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Dla hetaha pakoju nie akreślena tema"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s zaprošany ŭ %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Mianuška nia znojdziena: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Užyvańnie: /%s <mianyška|JID> [pryčyna], blakuje JID dla pakoju. Mianušku "
+#~ "možna źmianić, kali jana nia ŭtrymlivaje znaka \"@\". Kali JID jašče "
+#~ "znachodzicca ŭ pakoji, jon budzie vypchnuty preč. Prabieły ŭ mianuškach "
+#~ "nie padtrymvajucca."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Užyvańnie: /%s <mianuška>, adčyniaje akno pryvatnaj razmovy z akreślenaj "
+#~ "asobaj."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Užyvańnie: /%s [pryčyna], začyniaje dziejnaje akno albo kartku, pakazaŭšy "
+#~ "akreślenuju pryčynu."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Užyvańnie: /%s <JID> [pryčyna], zaprašaje JID u dziejny pakoj, z "
+#~ "akreślenym tłumačeńniem."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Užyvańnie: /%s <pakoj>@<server>[/mianuška], dałučajecca da pakoju "
+#~ "pakoj@server z akreślenaj mianuškaj."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Užyvańnie: /%s <mianuška> [pryčyna], vypichvaje asobu z takoj mianuškaj z "
+#~ "pakoju z akreślenaj pryčynaj. Prabieły ŭ mianuškach nie padtrymvajucca."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Užyvańnie: /%s <mianuška> [paviedamleńnie], adčyniaje akno pryvatnaj "
+#~ "razmovy i dasyłaje paviedamleńnie asobie z akreślenaj mianuškaj."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Užyvańnie: /%s <mianuška>, źmianiaje tvaju mianušku dla dziejnaja pakoju."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Užyvańnie: /%s, pakazvaje imiony naviednikaŭ pakoju."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Užyvańnie: /%s [tema], pakazvaje albo aktualizuje dziejnuju temu pakoju."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Užyvańnie: /%s <paviedamleńnie>, dasyłaje paviedamleńnie, nie šukajučy "
+#~ "inšych zahadaŭ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Užyvańnie: /%s <mianuška>, źmianiaje tvaju mianušku dla dziejnaja pakoju."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Pstykni, kab pahladzieć zdolnaści serveraŭ Jabber (naprykład, šluzy MSN, "
diff --git a/po/bg.po b/po/bg.po
index 051a7f330..50c97c6b0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:43+0200\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -213,6 +213,7 @@ msgstr "<b>Лични данни</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Акаунт"
 
@@ -280,8 +281,8 @@ msgstr "Редактиране на личните данни…"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -292,8 +293,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Общи"
 
@@ -352,25 +353,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Вашите лични данни, както са запазени на сървъра"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Няма"
 
@@ -528,8 +525,8 @@ msgstr ""
 "Може да помислите и да промените настройките на огнената стена, евентуално."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -543,7 +540,7 @@ msgid "Mer_ge accounts"
 msgstr "_Смесване на акаунти"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Пре_именуване"
 
@@ -806,7 +803,7 @@ msgid "All statuses"
 msgstr "Всички състояния"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Отсъствам"
 
@@ -823,7 +820,7 @@ msgid "Have "
 msgstr "имам "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Невидим"
 
@@ -832,7 +829,7 @@ msgid "Launch a command"
 msgstr "Изпълнение на команда"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
@@ -1018,7 +1015,7 @@ msgid "Join _Group Chat"
 msgstr "_Влизане в стая"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "Добавяне към _списъка…"
 
@@ -1044,39 +1041,6 @@ msgstr "_Отваряне на връзката в браузър"
 msgid "_Start Chat"
 msgstr "_Започване на разговор"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Покана на _контакти"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Изпращане на _файл"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Превключване на шифриране тип „End to End“"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Превключване на шифриране тип „Open_PGP“"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "Добавяне към _списъка…"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "Ист_ория"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "По_кана"
@@ -1101,6 +1065,119 @@ msgstr ""
 "На път сте да започнете разговор в стая.\n"
 "Изберете контактите, които искате да поканите."
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "_Запитване за виждане на състоянието на контакта"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Добавяне на специално _уведомление…"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Задаване на ключ Open_PGP…"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Изпълнение на команда…"
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Редактиране на _групи…"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "По_кана в"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Покана на _контакти"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "П_ремахване"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Изпращане на _специфично състояние"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Изпращане на _еднократно съобщение…"
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Изпращане на _файл…"
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Задаване на друг _аватар…"
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Започване на _разговор"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Превключване на шифриране тип „End to End“"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Превключване на шифриране тип „Open_PGP“"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Позволение за виждане на състоянието ми"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Блокиране"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "За_брана за виждане на състоянието ми"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "Ист_ория"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Игнориране"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Управление на контакт"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Преименуване…"
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Записване"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Деблокиране"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Премахване на игнорирането"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Попълнете формуляра."
@@ -1218,7 +1295,7 @@ msgstr ""
 "Ред за контакт\n"
 "Лента за разговор"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Получер"
 
@@ -1242,7 +1319,7 @@ msgstr "Отсъства"
 msgid "Inactive"
 msgstr "Бездеен"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1314,6 +1391,14 @@ msgstr "_Председател"
 msgid "Occupant Actions"
 msgstr "_Действия на участника"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Изпращане на _файл"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "Добавяне към _списъка…"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Администратор"
@@ -1322,13 +1407,6 @@ msgstr "_Администратор"
 msgid "_Ban"
 msgstr "_Забраняване на достъпа"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Блокиране"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Изритване"
@@ -1345,13 +1423,6 @@ msgstr "Со_бственик"
 msgid "_Send Private Message"
 msgstr "_Изпращане на лично съобщение"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Деблокиране"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Глас"
@@ -1360,7 +1431,7 @@ msgstr "_Глас"
 msgid "Create new post"
 msgstr "Създаване на ново съобщение"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "От"
 
@@ -1385,8 +1456,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добре дошли в мениджъра на историята на разговорите</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -1439,34 +1510,39 @@ msgstr "Търсене:"
 msgid "_Log conversation history"
 msgstr "_Запазване на разговорите"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Влизане в тази стая автоматично при свързване"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Псевдоним:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Скоро посетени:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Стая:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Влизане"
@@ -1495,7 +1571,7 @@ msgstr "Минимизиране при автоматично влизане"
 msgid "Print status:"
 msgstr "Изписване на състоянията:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Сървър:"
 
@@ -2036,7 +2112,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Подреждане на контактите по състояние"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Състояние"
 
@@ -2203,34 +2279,39 @@ msgid "All"
 msgstr "Всички"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "всички със записване"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Позволяване на"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Отказване"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Ред:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Филтър за уединение"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "всички със записване"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "всички в групата"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2242,19 +2323,19 @@ msgstr ""
 "от\n"
 "за"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "да ми изпраща съобщения"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "да ми изпращат лични съобщения"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "да ми изпращат състоянието си"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "да виждат състоянието ми"
 
@@ -2422,96 +2503,11 @@ msgstr "Премахване на акаунт от Gajim и от с_ървър�
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "_Запитване за виждане на състоянието на контакта"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Добавяне на специално _уведомление…"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Задаване на ключ Open_PGP…"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Редактиране на _групи…"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Изпълнение на команда…"
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "По_кана в"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "П_ремахване"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Изпращане на _специфично състояние"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Изпращане на _еднократно съобщение…"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Изпращане на _файл…"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Задаване на друг _аватар…"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Започване на _разговор"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Позволение за виждане на състоянието ми"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "За_брана за виждане на състоянието ми"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Игнориране"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Управление на контакт"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Преименуване…"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Записване"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Премахване на игнорирането"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2633,7 +2629,7 @@ msgid "_Add contact"
 msgstr "Добавяне на _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Информация"
 
@@ -2847,26 +2843,6 @@ msgstr "_Съобщение"
 msgid "_Presence"
 msgstr "С_ъстояние"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Добавяне на специално _уведомление"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Задаване на ключ на Open_PGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Редактиране на _групи"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Преименуване"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Промяна на акаунт…"
@@ -2910,48 +2886,48 @@ msgid "Service returned an error."
 msgstr "Услугата върна грешка."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Активирана"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Изключена"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Булев израз"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Число"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Цвят"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Име на опцията"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Стойност"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Няма)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Скрита"
 
@@ -2965,187 +2941,186 @@ msgstr "Получихте нов запис:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "английски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "белоруски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "български"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "бретонски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "чешки"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "немски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "гръцки"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "британски английски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "есперанто"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "испански"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "баски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "френски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "хърватски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "италиански"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "норвежки (Bokmål)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "холандски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "норвежки (Nynorsk)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "полски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "португалски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "бразилски португалски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "руски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "сръбски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "словашки"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "шведски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "китайски"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Език за проверка на правописа"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Неопределен"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Болен"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Информация за контакта"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Наистина ли да се изпрати файла?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Ако изпратите файл на %s, той/тя ще разбере истинския ви Jabber ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "Шифрирането чрез GPG е включено"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Не е в списъка"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Неизвестен изпълнител"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Неизвестно заглавие"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Неизвестен източник"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3154,17 +3129,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> на <i>%(artist)s</i>\n"
 "от <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s от стая %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Няма зададен ключ на GPG"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3172,50 +3147,50 @@ msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщенията с GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "Шифрирането чрез GPG е изключено"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "ЩЕ СЕ запазва дневник за сесията"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "НЯМА да се запазва дневник за сесията"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "е"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "НЕ е"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "Ще"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "НЯМА да"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "и удостоверяването е успешно"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "и удостоверяването НЕ Е успешно"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3224,66 +3199,23 @@ msgstr ""
 "Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
 "%(logged)s се запазва дневник за сесията."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Командата не се поддържа за акаунт тип „zeroconf“."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Команди: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Употреба: /%s, изчиства текстовия прозорец."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Употреба: /%s, скрива бутоните за разговор."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Употреба: /%(command)s <действие>, изпраща действие до текущата стая. "
-"Използва се трето лице (напр. „/%(command)s експлодира“)."
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Употреба: /%s, изпраща „ping“ до контакта."
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Употреба: /%s, изпраща съобщение до контакта."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Няма помощна информация за /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Договорката за сесията отменена"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Тази сесия е шифрирана"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " и ЩЕ СЕ запазва дневник"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " и НЯМА да се запазва дневник"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3291,25 +3223,25 @@ msgstr ""
 "Идентичността на отсрещния контакт не е потвърдена. Натиснете бутона със "
 "щита за повече информация."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "Шифрирането чрез E2E е изключено"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Следното съобщение НЕ БЕШЕ шифрирано"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Следното съобщение беше шифрирано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3317,15 +3249,15 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Грешка в базата от данни"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3334,7 +3266,7 @@ msgstr ""
 "Файлът „%s“ от базата от данни не може да бъде прочетен. Опитайте се да го "
 "поправите или изтриете (цялата история ще бъде загубена)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s вече е %(status)s"
@@ -3343,23 +3275,23 @@ msgstr "%(name)s вече е %(status)s"
 msgid "creating logs database"
 msgstr "създаване на база от данни за разговорите"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s e файл, а би трябвало да е папка"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Спиране на програмата"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s e папка, а би трябвало да е файл"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "създаване на папка %s"
@@ -3423,9 +3355,9 @@ msgstr "Изберете стаите, които искате да напусн
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Стаи"
 
@@ -3441,53 +3373,98 @@ msgstr "Препращане на непрочетени съобщения"
 msgid "All unread messages have been forwarded."
 msgstr "Всички непрочетени съобщения бяха препратени."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Използване на DBus и Notification-Daemon за показване на уведомленията"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Отсъствам поради липса на активност над $T мин)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
 "отсъствие."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Време в минути, след което състоянието да се променя на „Не съм на "
 "разположение“."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Не съм на разположение поради липса на активност над $T мин)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
 "отсъствие."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Невалиден псевдоним"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "текст на съобщението за състояние"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Невалиден псевдоним"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Промяна на псевдонима"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "текст на съобщението за състояние"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3495,22 +3472,17 @@ msgstr ""
 "свиват автоматично."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "по подразбиране"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-"Активиране на съобщения от/за локални потребители (link-local/zeroconf)"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Език, който да се използва за проверката на правописа"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3521,7 +3493,7 @@ msgstr ""
 "„print_ichat_every_foo_minutes“.\n"
 "„never“ - никога да не се изписва часа."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3532,18 +3504,18 @@ msgstr ""
 "1 е най-прецизния часовник, 4 е най-относителния. Това е в сила само ако "
 "опцията „print_time“ е настроена на „sometimes“."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Тълкуване на двойки от „* / _“ като възможни символи за форматиране."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ако е активирана, не се премахват */_. Така *абв* ще е в получер стил, но "
 "със символите * *."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3554,7 +3526,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Ако искате да използвате "
 "това, инсталирайте docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3562,7 +3534,7 @@ msgstr ""
 "Знак за добавяне след името на псевдонима при използване на автоматично "
 "допълване (TAB) в стая."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3570,7 +3542,7 @@ msgstr ""
 "Знак, който да се предложи да бъде добавен след желания псевдоним, когато "
 "той вече е използван от някой в стаята."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3581,19 +3553,19 @@ msgstr ""
 "документацията на Питон относно „strftime“ за повече информация: http://docs."
 "python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Знаци, които се изобразяват в разговори преди псевдонима"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Знаци, които се изобразяват в разговори след псевдонима"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Добавяне на * и [n] към заглавието на списъка?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3601,21 +3573,35 @@ msgstr ""
 "Колко реда от предишния разговор да за запомнят при повторното отваряне на "
 "подпрозорец/прозорец."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колко минути да отделят последните редове от предишния разговор."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "Изпращане на съобщение при Ctrl+Enter и нов ред с „Enter“."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3624,13 +3610,13 @@ msgstr ""
 "Или определен адрес, съдържащ %s, където %s е думата/фразата, или "
 "„WIKTIONARY“, което означава използване на wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
 "remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3642,14 +3628,14 @@ msgstr ""
 "„listen_to_network_manager“ и се синхронизират с общото състояние) в "
 "зависимост от състоянието на мрежовата връзка."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
 "„composing_only“, „disabled“."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3657,7 +3643,7 @@ msgstr ""
 "Показвани уведомления за състоянието на разговора в прозорците за разговор. "
 "Може да бъде „all“, „composing_only“, „disabled“."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3665,11 +3651,11 @@ msgstr ""
 "Когато не се изписва часа на всяко съобщение („print_time“ е настроено на "
 "„sometimes“), да се показва на всеки x минути."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3677,7 +3663,7 @@ msgstr ""
 "Винаги да се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3685,13 +3671,13 @@ msgstr ""
 "Никога да не се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3700,27 +3686,27 @@ msgstr ""
 "към локалните интерфейси за файлов трансфер в случай, че се ползва NAT/"
 "пренасочване на портове."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Уведомяване за събития в областта за уведомяване."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Показване на подпрозорец при един разговор?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показване на границата на подпрозореца в прозорците за разговор?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3732,18 +3718,18 @@ msgstr ""
 "15, 16, 17 и 18. По-големите числа са по-сигурни, но изчисленията отнемат "
 "повече време в началото на сесията."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Показване на нови съобщения в изскачащ прозорец?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Списък с думи, отделени с точка и запетая, които ще се осветяват при "
 "разговор в стая."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3752,14 +3738,14 @@ msgstr ""
 "администратора на прозорци. Тази настройка е валидна само ако се използва "
 "иконата в областта за уведомяване."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ако е активирана, Gajim ще проверява дали е стандартния Джабър клиент при "
 "всяко стартиране."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3767,7 +3753,7 @@ msgstr ""
 "Ако е активирана, ще се изобразява икона във всеки подпрозорец, съдържащ "
 "непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3775,12 +3761,12 @@ msgstr ""
 "Ако е активирана, ще се показва съобщението за състояние, ако има такова, на "
 "всеки контакт под името му списъка."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Позиция на аватара в списъка.  Може да е ляво (left) или дясно (right)."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3788,7 +3774,7 @@ msgstr ""
 "Ако е активирана, ще се изпраща запитване за аватар до всеки контакт, който "
 "е нямал такъв последния път или пък има остарял кеширан аватар."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3796,7 +3782,7 @@ msgstr ""
 "Ако е изключена, вече няма да виждате реда за състоянието при разговорите, "
 "когато контактът променя състоянието си."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3810,30 +3796,30 @@ msgstr ""
 "съобщения за състояние. Ако е „in_and_out“, ще се изписва само „Сульо влезе "
 "в стаята“ или „Сульо напусна“."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Цвят на фона на контактите, които се включват."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Цвят на фона на контактите, които се изключват."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ако е активирана, ще се използва по-малък шрифт от стандартния за "
 "възстановените съобщения."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Да не се показва аватара на транспорта."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Да не се показва списъка в панела."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3843,7 +3829,7 @@ msgstr ""
 "прозорецът ще мига (стандартното поведение при повечето мениджъри на "
 "прозорци) при задържане на чакащи събития."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3854,7 +3840,7 @@ msgstr ""
 "информация от тип SHA при присъствие в стаи."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3874,34 +3860,34 @@ msgstr ""
 "„pertype“ — Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
 "специфичен прозорец."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Ако е активирана, натискането на клавиша „Escape“ затваря прозореца/"
 "подпрозореца."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Скрива бутоните в прозорците за разговор."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Скрива лентата в прозореца на стаята"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Скрива лентата в прозорец за разговор с два контакта"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Скрива списъка на участниците в прозореца на стаята."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3909,15 +3895,15 @@ msgstr ""
 "В разговор, показва псевдонима в началото на реда само ако не е същия човек, "
 "който е написал предното съобщение."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Отстъп, когато се използва смесване на последователен псевдоним."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавно прелистване на съобщение в прозореца за разговор"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3925,11 +3911,11 @@ msgstr ""
 "Списък с цветове, разделени с „:“, които да се използват за оцветяване на "
 "псевдонимите в стаите."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-TAB отива на следващия подпрозорец, когато всички са прочетени."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3937,7 +3923,25 @@ msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
+"контакти? Празен низ означава никога да не се показва диалогов прозорец."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
+"контакти? Празен низ означава никога да не се показва диалогов прозорец."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3947,7 +3951,7 @@ msgstr ""
 "прозореца за промяна на акаунти. ВНИМАВАЙТЕ, понеже когато сте свързани с "
 "отрицателен приоритет, НЯМА да получите нито едно съобщение от сървъра."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3955,7 +3959,7 @@ msgstr ""
 "Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
 "keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3964,7 +3968,7 @@ msgstr ""
 "Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
 "keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3972,7 +3976,7 @@ msgstr ""
 "Ако е активирана, Gajim ще показва броя на включените контакти и общия брой "
 "в редовете за акаунти и групи."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3980,7 +3984,7 @@ msgstr ""
 "Може да е празно, „chat“ или „normal“. Ако не е празно, всички входящи "
 "съобщения се третират като от указания тип."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3989,7 +3993,7 @@ msgstr ""
 "изпратил последното съобщение, в случай, че прозорецът за разговор не е вече "
 "отворен."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3997,13 +4001,13 @@ msgstr ""
 "Ако е активирана, Gajim ще преобразува чрез „dvips“ низа между $$ и $$ в "
 "изображение преди да го вмъкне в прозореца за разговор."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Необходимо време без активност преди прозорецът за промяна на състоянието да "
 "се затвори."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4011,7 +4015,7 @@ msgstr ""
 "Максимален брой редове, които да се показват в разговорите. Най-старите "
 "редове се изчистват."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4019,11 +4023,11 @@ msgstr ""
 "Ако активирана, прозорците за уведомления от „notification-daemon“ ще бъдат "
 "прикрепени към иконата в областта за уведомяване."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Интервал между две проверки за липса на активност."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4031,7 +4035,7 @@ msgstr ""
 "Променете стойността за увеличаване или намаляване размера на изобразените "
 "формули на LaTeX. По-голяма стойност означава по-голям размер."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4040,13 +4044,23 @@ msgstr ""
 "Валидни схеми на адреси. Само схемите в този списък ще бъдат достъпни като "
 "„истински“ адреси."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4054,7 +4068,7 @@ msgstr ""
 "Приоритетът ще се променя автоматично в съответствие със състоянието ви. "
 "Приоритетите се настройват в опциите „autopriority_*“."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4063,26 +4077,38 @@ msgstr ""
 "„xa“, „dnd“ или „invisible“. ЗАБЕЛЕЖКА: Тази опция се използва само ако "
 "„restore_last_status“ е изключена."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Ако е активирана, възстановява се последното използвано състояние."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ако е изключена, не се се подписват съобщенията за състояние с ключ на GPG, "
 "дори и да е конфигуриран."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Активира шифриране тип „ESessions“ за този акаунт."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Дали Gajim да започва шифрирана сесия автоматично, ако е възможно?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4090,32 +4116,32 @@ msgstr ""
 "Списък (разделен с шпации) на видове свързвания. Може да съдържа „tls“, "
 "„ssl“ или „plain“."
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Показване на предупреждение преди изпращане на паролата при нешифрирана "
 "връзка."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показване на предупреждение преди използване на стандартната библиотека на "
 "SSL."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Списък (разделен с шпации) от грешки на SSL, които да се пренебрегват."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4125,11 +4151,11 @@ msgstr ""
 "връзката, преди да да се опита свързване наново."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Заобикалка заради Jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4137,15 +4163,15 @@ msgstr ""
 "Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Отговор на заявки"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Изпратени заявки"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4153,111 +4179,111 @@ msgstr ""
 "Когато се договаря шифрирана сесия, да се приема ли, че искате собствените "
 "съобщения да се запазват в дневник?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Активиран ли е OpenPGP за този контакт?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr "Да се започва ли шифрирана сесия с този контакт, когато е възможно?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Език, за който желаете да се проверяват сгрешените думи."
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "„all“ или състояния, разделени с интервал"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "„yes“, „no“ или „both“"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "„yes“, „no“ или „“"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, така че ми оставете съобщение."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "На линия съм."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Свободен за разговор."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Не съм на разположение."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Не ме притеснявайте."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Довиждане!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4265,99 +4291,99 @@ msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "„muc_higlighted_words“ или когато съобщение съдържа псевдонима ви."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "колониална"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "хуманна"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Неуспех при зареждането на модула „idle“"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Грешен хост"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Невалиден локален адрес? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Регистриране в %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Грешка при запис"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Състоянието „Невидим“ не се поддържа."
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Акаунтът „%s“ не поддържа невидимост."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4367,79 +4393,86 @@ msgstr ""
 "поправите (вижте http://trac.gajim.org/wiki/DatabaseBackup) или изтриете "
 "(цялата история ще бъде загубена)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Псевдонимът не е позволен: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Неуспех при влизането в стаята"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вие сте отлъчени от стаята %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Стаята %s не съществува."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Създаването на стаи е ограничено."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Не сте в списъка с членове на стаята %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Стаята е била унищожена"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Вместо това може да влезете в тази стая: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
 "roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "вече сме записани за %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "искане за отписване от %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "вече сме отписани от %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4449,227 +4482,213 @@ msgstr ""
 "Използвайте инструменти за управление на списък като http://jru.jabberstudio."
 "org/, за да го премахнете."
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Не беше зададена парола за OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Неуспех при получаването на списъка с отменени сертификати"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Неуспех при дешифрирането на подписа на сертификата"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Неуспех при дешифрирането на подписа на списъка с отменени сертификати"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Неуспех при декодирането на публичния ключ на издателя"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Грешка при проверката на подписа на сертификата"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Грешка при проверката на подписа на списъка с отменени сертификати"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Сертификатът все още не е валиден"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Валидността на сертификата е изтекла"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "Списъкът с отменени сертификати все още не е валиден"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "Валидността на списъка с отменени сертификати е изтекла"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка при форматирането на полето „notBefore“ на сертификата"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка при форматирането на полето „notAfter“ на сертификата"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „lastUpdate“ на списъка с отменени "
 "сертификати"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „nextUpdate“ на списъка с отменени "
 "сертификати"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Изчерпана памет"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Само-подписан сертификат"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Само-подписан сертификат в удостоверителската верига"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Неуспех при проверката на първия сертификат"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Удостоверителската верига е твърде дълга"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Сертификатът е отменен"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Невалиден сертификат на удостоверителя"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Максималната дължина на пътя е надвишена"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Неподдържана цел на сертификата"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Сертификатът не е доверен"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Сертификатът е отхвърлен"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Несъответствие на издателя на сертификата"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Несъответствие на идентификатора и сертифициращия орган"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Несъответствие на серийния номер на издателя и сертифициращия орган"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Основната употреба не включва подписване на сертификати"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Грешка на приложението за проверка"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Свържете се наново."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Сървърът „%(name)s“ отговори погрешно на запитването за регистрация: %(error)"
 "s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сървърът „%s“ предостави различна форма за регистрация"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестна грешка на SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Невалиден отговор"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспортът „%(name)s“ отговори погрешно на запитването за регистрация: %"
 "(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Неуспех при свързване с „%s“"
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Запазен в: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Неуспех при свързването със сървъра-посредник"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Неуспех при свързване с акаунт „%s“"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Връзката на акаунт „%s“ се разпадна. Опит за повторно свързване."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Автентичността на сертификата на %s може да е под въпрос."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4678,7 +4697,7 @@ msgstr ""
 "\n"
 "Грешка на SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4687,24 +4706,24 @@ msgstr ""
 "\n"
 "Неизвестна грешка на SSL: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Грешка при премахването на списъка за уединение"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4713,30 +4732,30 @@ msgstr ""
 "Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
 "свързаните ви ресурси. Изключете го и опитайте отново."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Нито отдалеченото присъствие е подписано, нито има зададен ключ."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "Ключът на контакта (%s) не съвпада със зададения в Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Това съобщение е *шифрирано* (вижте XEP:„27“)]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4745,30 +4764,40 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Покана на _контакти"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Неуспех при свързването"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Наблюдатели"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Транспорти"
 
@@ -4777,14 +4806,19 @@ msgid "Not in roster"
 msgstr "Не е в списъка"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На този компютър няма инсталиран модул на Питон за D-Bus"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Възможностите за D-Bus не могат да бъдат използвани"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
@@ -4862,56 +4896,69 @@ msgid "eleven"
 msgstr "единадесет"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s часа"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s и пет"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s и десет"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s и петнадесет"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s и двадесет"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s и двадесет и пет"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s и половина"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "%(1)s без двадесет и пет"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "%(1)s без двадесет"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "%(1)s без петнадесет"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "%(1)s без десет"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "%(1)s без пет"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s часа"
 
@@ -4979,224 +5026,224 @@ msgstr "Невалиден символ в името на хоста."
 msgid "Invalid character in resource."
 msgstr "Невалиден символ в ресурса."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Зает"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Зает"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "На _линия"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "На линия"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Свързване"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Изключен"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "Не_видим"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "Има грешки"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Двустранно"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Записване"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Не е установен"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Председатели"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Председател"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Участници"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Посетител"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Собственик"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Член"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "пише съобщение…"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d непрочетено съобщение"
 msgstr[1] "%d непрочетени съобщения"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " от стая %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " от потребител %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " от %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d чакащо събитие"
 msgstr[1] "%d чакащи събития"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Грешка при изпълнение на „%(command)s“: %(error)s"
@@ -5212,11 +5259,11 @@ msgstr "%s не е валидно ниво за дневник"
 msgid "error: cannot open %s for reading"
 msgstr "грешка: %s не може да бъде отворен за четене"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "синьозелена"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "мигриране на базата от данни с дневници към индекси"
 
@@ -5868,7 +5915,7 @@ msgstr ""
 "бъде отменен."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5876,7 +5923,7 @@ msgstr ""
 "[Това е част от шифрирана сесия. Ако виждате това съобщение, нещо не е както "
 "трябва.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5885,17 +5932,29 @@ msgstr ""
 "Хостът „%s“, който сте конфигурирали в опцията „ft_add_hosts_to_send“, не е "
 "валиден, така че се пренебрегва."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Не беше зададена парола за OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "За да продължите да изпращате и получавате съобщения, трябва да се свържете "
 "наново."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Грешка на Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5905,31 +5964,31 @@ msgstr ""
 "Изпращането и получаването на съобщения тип „link-local“ може и да не "
 "функционира правилно."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверете дали Avahi или Bonjour е инсталиран."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Неуспех при стартирането на локална услуга"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Неуспех при свързването с порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Проверете дали е стартиран avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Неуспех при промяната на състоянието на акаунт „%s“"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5938,20 +5997,20 @@ msgstr ""
 "изпратено."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Това съобщение е шифрирано]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Съобщението ви не можа да бъде изпратено."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5964,24 +6023,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Грешка при добавянето на услугата. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Изключени"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Стандартно съобщение"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Няма наличен речник за %s език"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5990,214 +6049,220 @@ msgstr ""
 "За да използвате проверката за правопис, трябва да инсталирате %s речник или "
 "да изберете друг език чрез настройването на опцията „speller_language“."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Свързване наново?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Непрочетени събития"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Имате активни разговори за акаунт „%s“"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "За да смените името на акаунта, трябва да прочетете всички чакащи събития."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Преименуване на акаунт"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Въведете ново име за акаунт „%s“"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде във формат „user@server“."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Избор на ключ на OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия ключ на OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Сървърът ви не поддържа визитки"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Сървърът ви не може да запази личната ви информация."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Трябва да сте изключени, за да смените името на акаунта."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Името на акаунта вече се използва."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Преименувайте го или го премахнете преди да активирате съобщения от/за "
 "локални контакти."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Списък с отлъчени"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Списък с членове"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Списък със собственици"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Списък с администратори"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Отлъчване…"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6205,11 +6270,11 @@ msgstr ""
 "<b>Кого искате да отлъчите?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Добавяне на член…"
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6217,11 +6282,11 @@ msgstr ""
 "<b>Кого искате да направите член?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик…"
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6229,11 +6294,11 @@ msgstr ""
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор…"
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6241,7 +6306,7 @@ msgstr ""
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6258,123 +6323,122 @@ msgstr ""
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ под-домейн."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт „%s“"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "Всички"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Само влизащи и излизащи"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "Без"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Нова стая"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Невалиден псевдоним"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Псевдонимът не е позволен: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Невалиден сървър"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Задайте сървър, където искате да се регистрирате."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Сертификатът вече е във файла"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Този сертификат вече е във файла „%s“, така че няма да бъде добавен наново."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6389,7 +6453,7 @@ msgstr ""
 "Грешка на SSL: %(error)s\n"
 "Все още ли искате да се свържете с този сървър?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6400,63 +6464,63 @@ msgstr ""
 "Отпечатък тип SHA1 на сертификата:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Първо получено съобщение"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Следващо получено съобщение в прозорец на фокус"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Следващо получено съобщение в прозорец без фокус"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Включване на контакт"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Изключване на контакт"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Изпратено съобщение"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Осветено съобщение в стая"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Получена поща от Gmail"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6466,7 +6530,7 @@ msgstr ""
 "получено от отсрещния контакт. Ако иконата остане\n"
 "дълго време, най-вероятно съобщението е било изгубено."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6474,74 +6538,74 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто\n"
 "за последен път сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Изход"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия за „%s“"
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Липсва „%s“ в адреса на речника и не е WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в адреса за търсене"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Отваряне като _връзка"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "Преди %i дни"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "В списъка вече има такъв Jabber ID"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Въведеният Jabber ID вече съществува в списъка. Изберете друг."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6576,122 +6640,122 @@ msgstr "Име на контакта"
 msgid "Set Mood"
 msgstr "Задаване на настроение"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Съобщение за състояние"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Презаписване на съобщението за състояние?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Това име вече се използва. Искате ли да презапишете това съобщение за "
 "състояние?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Запазване като настроено съобщение за състояние"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Напишете име за това съобщение за състояние"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "Адрес на AIM:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Номер на GG:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Номер на ICQ:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "Адрес на MSN:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Адрес на Yahoo!:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Не може да добавите себе си към списъка."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Идентификатор на потребител:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Джабър клиент за GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Версия на GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Версия на PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Текущи разработчици:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Бивши разработчици:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "И не на последно място, бихме искали да благодарим на всички, които "
 "поддържат пакетите."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@gnu.org>\n"
@@ -6700,7 +6764,7 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6713,88 +6777,98 @@ msgstr ""
 "\n"
 "Функционалността за осветяване на сгрешени думи ще е изключена"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Псевдонимът съдържа непозволени знаци."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Искане за записване за акаунт „%(account)s“ от %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Невалидно име на акаунт"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Акаунт, от който искате да влезете в стаята"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Невалиден псевдоним"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Невалиден Jabber ID на стая"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Това не е стая"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не е име на стая."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Този акаунт не е свързан към сървъра"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не може да се синхронизирате с акаунт, ако не е свързан."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Синхронизиране"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6803,302 +6877,302 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Невалиден JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Неуспех при анализирането на „%s“."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Ново съобщение"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Покана за разговор в стая"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Контактът промени състоянието си"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Еднократно съобщение за акаунт „%s“"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "От %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML конзола"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr ""
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Унил"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Филтър за уединение <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Филтър за уединение за %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ред: %(order)s, действие: %(action)s, вид: %(type)s, стойност: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ред: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редактиране на правило</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавяне на правило</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Филтри за уединение за %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Филтри за уединение"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Невалидно име на филтър"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Поканени сте в стая."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ви покани да се присъедините към дискусия"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ви покани в стая %(room_jid)s."
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Искате ли да приемете поканата?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когато %s стане:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавяне на специално уведомление за %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "когато съм "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7109,19 +7183,19 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ (SAS) на сесията е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Вече се проверили идентичността на този контакт."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Идентичността на контакта проверена"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Проверка наново…"
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7131,19 +7205,19 @@ msgstr ""
 "съобщения или да ви изпраща такива, е необходимо да проверите идентичността "
 "му като натиснете бутона по-долу."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Идентичността на контакта НЕ Е проверена"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Проверка…"
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Проверихте ли идентичността на контакта?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7158,22 +7232,22 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ на тази сесия е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Говорихте ли с отдалечение контакт за проверка на SAS?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "Ключът на контакта (%s) <b>не съвпада</b> с този, зададен в Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7182,7 +7256,7 @@ msgstr ""
 "така че съобщенията <b>не могат</b> да се шифрират. За да се доверите на "
 "този ключ, използвайте клиент на GPG."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7277,20 +7351,20 @@ msgstr "Описание"
 msgid "Id"
 msgstr "Идентификатор"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Отметката вече е установена"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Стаята „%s“ вече присъства в отметките."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Може да организирате отметките чрез менюто „Действия“."
 
@@ -7302,15 +7376,15 @@ msgstr "Записан"
 msgid "Node"
 msgstr "Възел"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Ново съобщение"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
@@ -7764,31 +7838,31 @@ msgstr "Необходим е X сървър. Спиране на програм
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim изисква PyGTK 2.8 или по-нова версия"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim изисква PyGTK 2.8 или по-нова версия. Спиране на програмата…"
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim изисква GTK 2.8 или по-нова версия"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim изисква GTK 2.8 или по-нова версия. Спиране на програмата…"
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Липсва поддръжка на libglade за библиотеката GTK+"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7797,22 +7871,22 @@ msgstr ""
 "Премахнете текущата версия на библиотеката GTK+ и инсталирайте последната "
 "стабилна от %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Уверете се, че версиите на GTK+ и PyGTK на системата ви имат поддръжка за "
 "libglade."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim изисква PySQLite2"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim изисква pywin32"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7821,11 +7895,11 @@ msgstr ""
 "Уверете се, че Pywin32 е инсталиран на системата. Може да го изтеглите от %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim вече е стартиран"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7833,35 +7907,35 @@ msgstr ""
 "Изглежда вече е стартирана друга инстанция на Gajim\n"
 "Продължаване въпреки това?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Няма зададен ключ на GPG"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Грешна парола"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7872,59 +7946,59 @@ msgstr ""
 "участник.\n"
 "Укажете друг псевдоним по-долу:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Приемате ли това запитване за акаунт %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Упълномощаване по HTTP (%(method)s) за „%(url)s“ (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка при изпращане на %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Искане за записване"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7932,79 +8006,79 @@ msgstr ""
 "Винаги ще го виждате като изключен.\n"
 "Искате ли да го премахнете от списъка с контакти?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Отписване"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Неуспех при установяването на контакт с „%s“"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s вече е познат като %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s вече е %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s зададе темата на %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "На всеки участник е позволено да вижда вашия JID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Стаята показва отсъстващ член"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "Стаята не показва отсъстващи членове"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Възникна промяна в конфигурацията на стаята (не е свързана с настройки за "
 "уединение)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Воденето на дневник на стаята е изключено"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Стаята не е анонимна"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Стаята е полу-анонимна"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Стаята е напълно анонимна"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8012,20 +8086,25 @@ msgstr ""
 "Конфигурирали сте Gajim да използва агент на GPG, но такъв не е стартиран "
 "или е предоставил грешна парола.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Паролата е грешна"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG не е използваем"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -8034,13 +8113,14 @@ msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "Да _не се задава този въпрос отново"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8049,19 +8129,19 @@ msgstr ""
 "Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
 "променливата на обкръжението не е настроена)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ново писмо за %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Имате %d ново писмо"
 msgstr[1] "Имате %d нови писма"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8076,44 +8156,44 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получихте %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8122,46 +8202,46 @@ msgstr ""
 "Неуспех при дешифрирането на съобщение от %s\n"
 "Възможно е да е било фалшифицирано."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Неуспех при дешифриране на съобщението"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Конфликт с имената на потребители"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Укажете ново потребителско име за локалния ви акаунт"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s сек)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Грешка."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Конфликт на ресурсите"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Вече сте свързани към този акаунт със същия ресурс. Въведете нов."
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при проверка на сертификата на SSL"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8172,15 +8252,15 @@ msgstr ""
 "(error)s\n"
 "Все още ли искате да се свържете със сървъра?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Пренебрегване на грешката за този сертификат."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Грешка в сертификата на SSL"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8196,11 +8276,11 @@ msgstr ""
 "\n"
 "Все още ли искате да се свържете и да обновите отпечатъка на сертификата?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Несигурна връзка"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8208,11 +8288,11 @@ msgstr ""
 "На път сте да изпратите паролата си чрез нешифрирана връзка. Сигурни ли сте, "
 "че искате да го направите?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, наистина искам да се свържа по несигурен начин"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8221,27 +8301,27 @@ msgstr ""
 "инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
 "да го направите?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "Възелът на PEP не беше премахнат"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Емотиконите са изключени"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Темата с емотикони не беше намерена, така че са изключени."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8251,13 +8331,13 @@ msgstr ""
 "формата на файла emoticons.py. Вижте http://trac.gajim.org/wiki/Emoticons за "
 "повече подробности."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Не може да влезете в стая, докато сте невидими."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
@@ -8291,12 +8371,13 @@ msgstr ""
 "ред"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "акаунт"
 
@@ -8324,9 +8405,9 @@ msgstr ""
 "away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
 "(невидим)"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "съобщение"
 
@@ -8344,24 +8425,49 @@ msgstr ""
 "общото състояние“"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Промяна на състоянието на акаунта или акаунтите"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Приори_тет:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "_Искам да регистрирам нов акаунт"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"променя състоянието на акаунта. Ако не е указано се прави опит за смяна на "
+"състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
+"общото състояние“"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Показване на диалогов прозорец за разговор, за да може да се изпрати "
 "съобщение до контакта"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID на контакта, с който искате да разговаряте"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако е указано, контактът се взима от списъка с контакти на този акаунт"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8371,30 +8477,30 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID на контакта, който ще получи съобщението"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "текст на съобщението"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "ключ на OpenPGP"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ако е указано, съобщението ще се шифрира, използвайки този публичен ключ"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8404,136 +8510,136 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "тема на съобщението"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Изпраща ново съобщение до стаята, в която сте влезли."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID на стаята, която ще получи съобщението"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Получаване на подробна информация за контакта"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID на контакта"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Получаване на подробна информация за акаунта"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Име на акаунта"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Изпращане на файл до контакт"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Път до файл"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "ако е указано, файлът бъде изпратен от този акаунт"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Показва всички настройки и техните стойности"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Настройва стойността на „ключ“ на „стойност“."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ключ=стойност"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "„ключ“ е името на настройката, „стойност“ е стойността, която се задава"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Изтрива обект от настройките"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "име на настройката за изтриване"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запазва текущото състояние на настройките във файла .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Добавяне на контакт към списъка"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Добавяне на нов контакт към този акаунт"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Връща текущото състояние (общото, в случай, че не е указан акаунт)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Връща текущото съобщение за състояние (общото, в случай, че не е указан "
 "акаунт)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Връща броя непрочетени съобщения"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Отваря прозореца „Започване на разговор“"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Започване на разговор, като се използва този акаунт"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Изпраща указан XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML за изпращане"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8541,72 +8647,72 @@ msgstr ""
 "Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
 "акаунти"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработка на адрес тип xmpp://"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "адрес"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "Адрес за обработка"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Акаунт, за който искате да го обработите"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "текст на съобщението"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Влизане в стая"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "стая"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "JID на стая"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "псевдоним"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Псевдоним"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "парола"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Парола за влизане в стаята"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Акаунт, от който искате да влезете в стаята"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Проверка дали Gajim е стартиран"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Показва или скрива прозореца на IPython"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8615,16 +8721,16 @@ msgstr ""
 "„%s“ не е в списъка ви.\n"
 "Укажете акаунт за изпращането на това съобщение."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Нямате активен акаунт"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8633,16 +8739,16 @@ msgstr ""
 "Употреба: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s не е намерен"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8651,7 +8757,7 @@ msgstr ""
 "Употреба: %s команда [аргументи]\n"
 "Командата е една от:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8660,7 +8766,7 @@ msgstr ""
 "Твърде много аргументи. \n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8669,7 +8775,7 @@ msgstr ""
 "Не е указан аргумент „%(arg)s“.\n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Грешен адрес"
 
@@ -8698,287 +8804,149 @@ msgstr "Не може да изтриете текущата тема"
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вече не сте в стая „%(room)s“ или „%(nick)s“ е напуснал(а)."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Разговор с "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Продължен разговор"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Беше създадена нова стая"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сървърът назначи или промени псевдонима ви в стаята"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "рангът е променен"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "Конфигурацията на стаята бе променена на „само за членове“"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "Изключване на системата"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s от %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s от %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s влезе в стаята"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Псевдонимът не е намерен: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Тази стая няма тема"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s е поканен в %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Псевдонимът не е намерен: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Употреба: /%s <псевдоним|JID> [причина], отлъчва контакта от стаята. "
-"Псевдонимът може да се замества, но не и ако съдържа „@“. Ако контактът е в "
-"стаята, той също ще бъде изритан. Не се поддържат интервали в псевдонима."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
-"участник."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Употреба: /%s [причина], затваря текущия прозорец или подпрозорец и показва "
-"причина, ако е указана."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Употреба: /%s <JID> [причина], кани JID в текущата стая, причината е по "
-"избор."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Употреба: /%s <стая>@<сървър>[/псевдоним], предлага влизане в стая@сървър, "
-"използването на указания псевдоним е по избор."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Употреба: /%s <псевдоним> [причина], премахва указания с псевдоним участник "
-"от стаята и евентуално показва причина. Не се поддържат интервали в "
-"псевдонима."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Употреба: /%s <псевдоним> [съобщение], отваря прозорец за лично съобщение и "
-"изпраща съобщение до участника, указан с псевдонима."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Употреба: /%s, показва имената на участниците в стаята."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Употреба: /%s [тема], показва или актуализира текущата тема на стаята."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Употреба: /%s <съобщение>, изпраща съобщение без да се имат предвид други "
-"команди."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Унищожаване на %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8986,22 +8954,22 @@ msgstr ""
 "Определено сте на път да унищожите тази стая.\n"
 "Може да укажете причина по-долу:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Може да въведете и друго място за срещи:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Отлъчване на %s"
@@ -9077,6 +9045,16 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Запазване на изображението като…"
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Нова стая"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr ""
+"Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
+"roster."
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Неуспех при откриването на базата от данни за разговорите"
@@ -9159,52 +9137,62 @@ msgstr "История на разговорите с %s"
 msgid "Disk Error"
 msgstr "Грешка при запис/четене от диска"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s вече е %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Грешка: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Грешка."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Изтече времето за зареждане на изображението"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Изображението е твърде голямо"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Наистина ли искате да изтриете избраното съобщение?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Стаи"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Съобщения"
 
@@ -9265,18 +9253,18 @@ msgstr "_Игнориране"
 msgid "Retrieving profile..."
 msgstr "Извличане на профила…"
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Файлът не съдържа нищо"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Файлът не съществува"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
@@ -9307,46 +9295,46 @@ msgid ""
 msgstr ""
 "Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG не е използваем"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9354,28 +9342,28 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "без синхронизация"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9383,16 +9371,16 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята и контактът е в списъка."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9400,11 +9388,11 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Ще бъдат премахнати транспорти"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9413,57 +9401,70 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "тези транспорти: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
+"продължите?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Преименуване на контакт"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Въведете нов псевдоним за контакт „%s“"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Преименуване на група"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Въведете ново име за група „%s“"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Премахване на група"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Искате ли да премахнете групата „%s“ от списъка?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Премахване от списъка и на всички контакти в тази група"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9472,11 +9473,11 @@ msgstr ""
 "ще ви вижда изключен."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Искате ли да продължите?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9484,16 +9485,16 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Ще бъдат премахнати контакти от списъка"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9502,20 +9503,35 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
+"продължите?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сървърът ви няма поддръжка за мета-контакти"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9523,14 +9539,14 @@ msgstr ""
 "Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
 "че тази информация няма да се запази при следващото свързване."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9540,23 +9556,23 @@ msgstr ""
 "Основно се използва, когато един и същ потребител има няколко акаунта за "
 "Джабър или акаунти за транспорти."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Невалиден адрес на файл:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Искате ли да изпратите този файл на %s:"
 msgstr[1] "Искате ли да изпратите тези файлове на %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Изпращане на %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Изпращане на файл до контакт"
@@ -9566,117 +9582,127 @@ msgstr "Изпращане на файл до контакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Управление на отметките…"
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Публикуване на мелодия"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Настройване на услуги…"
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Максимизиране на всички"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "_Изпращане на групово съобщение"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "До всички потребители"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "До всички включени потребители"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr ""
-"Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
-"roster."
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Управление на контакти"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Редактиране на _групи"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Изпращане на еднократно съобщение"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Изпълнение на команда…"
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "Управление на _транспорт"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "Промяна на т_ранспорт"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Преименуване"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Максимизиране"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Изключване"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Нова стая"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Изключване"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Влизане в нова стая"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние…"
 
@@ -9693,20 +9719,20 @@ msgstr "Грешка в получените данни"
 msgid "No result"
 msgstr "Няма резултати"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Грешка при запис на диска"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Потвърждение на тези настройки на сесията"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9721,7 +9747,7 @@ msgstr ""
 "\n"
 "\tДопустими ли са тези настройки?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9917,6 +9943,135 @@ msgstr "Няма чакащо запитване за записване."
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Добавяне на специално _уведомление"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Задаване на ключ на Open_PGP"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Командата не се поддържа за акаунт тип „zeroconf“."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Команди: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Употреба: /%s, изчиства текстовия прозорец."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Употреба: /%s, скрива бутоните за разговор."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Употреба: /%(command)s <действие>, изпраща действие до текущата стая. "
+#~ "Използва се трето лице (напр. „/%(command)s експлодира“)."
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Употреба: /%s, изпраща „ping“ до контакта."
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Употреба: /%s, изпраща съобщение до контакта."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Няма помощна информация за /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr ""
+#~ "Активиране на съобщения от/за локални потребители (link-local/zeroconf)"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Псевдонимът не е намерен: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Тази стая няма тема"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s е поканен в %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Псевдонимът не е намерен: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Употреба: /%s <псевдоним|JID> [причина], отлъчва контакта от стаята. "
+#~ "Псевдонимът може да се замества, но не и ако съдържа „@“. Ако контактът е "
+#~ "в стаята, той също ще бъде изритан. Не се поддържат интервали в "
+#~ "псевдонима."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със "
+#~ "съответния участник."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Употреба: /%s [причина], затваря текущия прозорец или подпрозорец и "
+#~ "показва причина, ако е указана."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Употреба: /%s <JID> [причина], кани JID в текущата стая, причината е по "
+#~ "избор."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Употреба: /%s <стая>@<сървър>[/псевдоним], предлага влизане в "
+#~ "стая@сървър, използването на указания псевдоним е по избор."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Употреба: /%s <псевдоним> [причина], премахва указания с псевдоним "
+#~ "участник от стаята и евентуално показва причина. Не се поддържат "
+#~ "интервали в псевдонима."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Употреба: /%s <псевдоним> [съобщение], отваря прозорец за лично съобщение "
+#~ "и изпраща съобщение до участника, указан с псевдонима."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Употреба: /%s, показва имената на участниците в стаята."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Употреба: /%s [тема], показва или актуализира текущата тема на стаята."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Употреба: /%s <съобщение>, изпраща съобщение без да се имат предвид други "
+#~ "команди."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Натиснете, за да видите функционалностите (като MSN, ICQ транспорти) на "
diff --git a/po/br.po b/po/br.po
index cce8569d0..bf24bab46 100644
--- a/po/br.po
+++ b/po/br.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -227,6 +227,7 @@ msgstr "<b>Titouroù hiniennel</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Kont"
 
@@ -295,8 +296,8 @@ msgstr "Kemmañ an titouroù hiniennel..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -307,8 +308,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Hollek"
 
@@ -369,25 +370,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Titouroù diwar ho penn, miret war ar servijer"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Alc'hwez ebet diuzet"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Hini ebet"
 
@@ -537,8 +534,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "ID Jabber:"
 
@@ -554,7 +551,7 @@ msgid "Mer_ge accounts"
 msgstr "_Strollañ ar c'hontoù"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "_Adenvel"
 
@@ -829,7 +826,7 @@ msgid "All statuses"
 msgstr "Stad:"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Ezvezant"
 
@@ -846,7 +843,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Diwelus"
 
@@ -856,7 +853,7 @@ msgid "Launch a command"
 msgstr "urzhiad"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Dihegerz"
 
@@ -1047,7 +1044,7 @@ msgid "Join _Group Chat"
 msgstr "Ebarzhiñ ur _webgaoz"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "_Ouzhpennañ er roll"
@@ -1074,64 +1071,156 @@ msgstr "_Digerién an ere er furcher web"
 msgid "_Start Chat"
 msgstr "_Kregiñ da flapiñ"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Diwelus"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Sellerien"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+#, fuzzy
+msgid "A_sk to see his/her status"
+msgstr "Goulenn evit gwelet e/he stad"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Ouzhpennañ ur gelaouenn _ispisial"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Assigner une clé OpenPGP"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "urzhiad"
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Kemmañ ar _strolladoù"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Darempredoù"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Dilemel"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Goulenn evit gwelet e/he stad"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Kas ur gemennadenn _simpl..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "Kas ur _restr"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Kregiñ da _flapiñ"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 msgid "Toggle End to End Encryption"
 msgstr ""
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr ""
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Ouzhpennañ er roll"
+#: ../data/glade/contact_context_menu.glade.h:17
+#, fuzzy
+msgid "_Allow him/her to see my status"
+msgstr "He/E aotren da welet ma stad"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:19
+#, fuzzy
+msgid "_Forbid him/her to see my status"
+msgstr "Difenn dezhañ/dezhi gwelet ma stad"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "_Istoradur"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Diwelus"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "Sellerien"
+msgid "_Manage Contact"
+msgstr "Darempredoù"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Adenvel"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Koumanant"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "_Kenderc'hel"
+
 #: ../data/glade/data_form_window.glade.h:1
 #, fuzzy
 msgid "Fill in the form."
@@ -1254,7 +1343,7 @@ msgstr ""
 "Darempred\n"
 "Titl"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Tev"
 
@@ -1278,7 +1367,7 @@ msgstr "Aet kuit"
 msgid "Inactive"
 msgstr "Dizoberiant"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Stouet"
 
@@ -1357,6 +1446,14 @@ msgstr "Ka_sour-ez"
 msgid "Occupant Actions"
 msgstr "_Galloudoù an darempred"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Kas ur _restr"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Ouzhpennañ er roll"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Merour-ez"
@@ -1365,13 +1462,6 @@ msgstr "_Merour-ez"
 msgid "_Ban"
 msgstr "_Argas"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Ermaeziañ"
@@ -1388,13 +1478,6 @@ msgstr "_Perc'hener-ez"
 msgid "_Send Private Message"
 msgstr "_Kas ur gemennadenn brevez"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr ""
@@ -1403,7 +1486,7 @@ msgstr ""
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Digant"
 
@@ -1425,8 +1508,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Merour istoradur Gajim"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Dilemel"
 
@@ -1472,35 +1555,40 @@ msgstr "Klask"
 msgid "_Log conversation history"
 msgstr "_Istoradur flapiñ"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 #, fuzzy
 msgid "Join this room automatically when I connect"
 msgstr "Aozañ ma aelad pa lugan"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Lesanv:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Ger-kuzh:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Nevez 'zo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Webgaoz:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "E_barzhiñ"
@@ -1530,7 +1618,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Diskouez an eur:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Servijer:"
 
@@ -2080,7 +2168,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "_Urzhiañ an darempredoù hervez o stad"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Stad"
 
@@ -2254,39 +2342,44 @@ msgid "All"
 msgstr ""
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "_Koumanant"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Nac'hañ"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "JabberID"
 msgstr "ID Jabber:"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 #, fuzzy
 msgid "Order:"
 msgstr "Servijer:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 #, fuzzy
 msgid "Privacy List"
 msgstr "Roll argas"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Koumanant"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 #, fuzzy
 msgid "all in the group"
 msgstr "Er strollad"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2294,21 +2387,21 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 #, fuzzy
 msgid "to send me messages"
 msgstr "Kas ur gemennadenn"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to send me status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 #, fuzzy
 msgid "to view my status"
 msgstr "He/E aotren da welet ma stad"
@@ -2502,108 +2595,11 @@ msgstr "Dilemel ar gont diwar Gajim ha diwar ar _servijer"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Dilemel"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-#, fuzzy
-msgid "A_sk to see his/her status"
-msgstr "Goulenn evit gwelet e/he stad"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Ouzhpennañ ur gelaouenn _ispisial"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Assigner une clé OpenPGP"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "Kemmañ ar _strolladoù"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr ""
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Dilemel"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Goulenn evit gwelet e/he stad"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Kas ur gemennadenn _simpl..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "Kas ur _restr"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Kregiñ da _flapiñ"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#, fuzzy
-msgid "_Allow him/her to see my status"
-msgstr "He/E aotren da welet ma stad"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Forbid him/her to see my status"
-msgstr "Difenn dezhañ/dezhi gwelet ma stad"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "Darempredoù"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Adenvel"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Koumanant"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "_Kenderc'hel"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2733,7 +2729,7 @@ msgid "_Add contact"
 msgstr "Ouzhpennañ un _darempred"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "Titouroù"
@@ -2964,26 +2960,6 @@ msgstr "_Kemennadenn"
 msgid "_Presence"
 msgstr "_Bezañs"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Ouzhpennañ ur gelaouenn _ispisial"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr ""
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Kemmañ ar _strolladoù"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Adenvel"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Kemmañ ar gont..."
@@ -3029,51 +3005,51 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Activated"
 msgstr "Oberiant"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Deactivated"
 msgstr "Dizoberiant"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Integer"
 msgstr "Er strollad"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Dibab"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Talvoud"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Doare"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Hini ebet)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Elfennoù kuzh"
 
@@ -3087,256 +3063,255 @@ msgstr ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "German"
 msgstr "Hollek"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Greek"
 msgstr "Glas"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Croatian"
 msgstr "Chomlec'h"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Italian"
 msgstr "Stouet"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Polish"
 msgstr "_Embann"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Serbian"
 msgstr "Hollek"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Islinennañ"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Lesanv"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Nodrezh:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Titouroù"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "War enaou emañ ar sifrañ"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Ket er roll"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Implij an diskleriañ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Implij an diskleriañ"
@@ -3344,101 +3319,58 @@ msgstr "Implij an diskleriañ"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Urzhioù: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Usage : /%s, nettoie la fenêtre."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Usage: /%s, cache les boutons de discussion."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Usage : /%s <action>, envoie l'action au salon actuel. Utilise la troisième "
-"personne. (ex : /%s explose.)"
-
-#: ../src/chat_control.py:1777
-#, fuzzy, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte."
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Usage: /%s, cache les boutons de discussion."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "N'eus skoazell hegerz ebet evit /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "O paouez resev ur gemennadenn nevez digant \"%s\" emaoc'h"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3446,22 +3378,22 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
@@ -3470,23 +3402,23 @@ msgstr "%(nick)s a zo bremañ %(status)s"
 msgid "creating logs database"
 msgstr "o krouiñ titourva an istoradur"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "ur restr eo %s met rankout a rafe bezañ ur renkell"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Emañ Gajim o vont da guitaat diouzhtu"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "ur renkell eo %s met rankout a rafe bezañ ur restr"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "a grou ar renkell %s"
@@ -3557,9 +3489,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 #, fuzzy
 msgid "Groupchats"
 msgstr "Flapoù a-stroll"
@@ -3578,135 +3510,176 @@ msgstr "Gajim - %d gemennadenn nevez"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 "Implij DBus ha Notification-Daemon evit diskouez ar c'hemennadennoù-kelaouiñ"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel ezvezant."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ezvezant rak dizoberiant"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel dihegerz."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Dihegerz rak dizoberiant."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Anv-arveriad-ez direizh"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "korf ar gemennadenn stad"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Anv-arveriad-ez direizh"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Cheñch lesanv"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "korf ar gemennadenn stad"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "Dilemel"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Implij ur re */_ evel arouezioù neuziañ an destenn."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "M'eo gwir, ne vo ket dilamet */_. Neuze e vo *abc* tev ma ne vez ket dilamet "
 "* *."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Ouzhpennañ * hag [n] da ditl ar roll darempredoù?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3714,13 +3687,27 @@ msgstr ""
 "Niver a linennoù da vemoriñ diouzh ar gaozeadenn gent pa vez addigoret un "
 "ivinell pe ur prenestr."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "E-pad pet munutenn e rank linennoù diwezhañ ar gaozeadenn kent bezañ "
 "gwarezet."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3728,11 +3715,11 @@ msgstr ""
 "Kas ar gemennadenn gant Ctrl+Kas ha mont d'al linenn gant Kas (emzalc'h dre-"
 "ziouer ar poellad ICQ Mirabilis)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Niver a linennoù da zerc'hel soñj evit Ctrl+BirLaez"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3741,12 +3728,12 @@ msgstr ""
 "Pe un url personelaet gant %s ennañ, %s o vezañ ar ger-kuzh pe 'WIKTIONARY' "
 "hag a dalvez implij wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "M'eo diuzet, e vo tu da sturiañ Gajim a-bell en ur implij gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3754,28 +3741,28 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
@@ -3784,7 +3771,7 @@ msgstr ""
 "Goulenn atav a-raok serriñ ar webgaozioù dispartiet gant un esaouenn ar roll-"
 "mañ."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
@@ -3793,40 +3780,40 @@ msgstr ""
 "Chom hep goulenn morse a-raok serriñ ar webgaozioù dispartiet gant un "
 "esaouenn er roll-mañ."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 msgstr ""
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Hervez ar standard IEC, KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3834,34 +3821,34 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Noti_fications d'état de discussion"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 msgstr ""
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 msgstr ""
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -3870,23 +3857,23 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 msgstr ""
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr ""
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3895,35 +3882,35 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -3935,7 +3922,7 @@ msgstr ""
 "l'information sha dans les présences des salons"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3953,526 +3940,566 @@ msgstr ""
 "'peracct' - An holl gaozioù en ur prenestr hervez ar gont.\n"
 "'pertype' - Bep a brenestr gant ur stumm flapiñ (webgaoz/flap)."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "M'eo faos, ne weloc'h ket an avatar er prenestr-flapiñ ken"
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "M'eo gwir, klikit war an douchenn Echap evit serriñ un ivinell/prenestr"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "A guzha roll ar berzhidi en ur prenestr webgaoz"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Kas ar gemennadenn ha serriñ ar prenestr"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr ""
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "M'eo faos, ne weloc'h ket an avatar er prenestr-flapiñ ken"
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "O labourat"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Er-maez"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 #, fuzzy
 msgid "I'm available."
 msgstr "Hegerz"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Prest da flapiñ"
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 #, fuzzy
 msgid "I'm not available."
 msgstr "Dihegerz"
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "Glas"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "Mab-den"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "Glas-mor"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, fuzzy
 msgid "Wrong host"
 msgstr "Ger-kuzh faos"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Gant berzh eo bet embannet ar vCard"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4482,285 +4509,271 @@ msgstr ""
 "de contact. Utiliser un outil de gestion de liste de contact tel que http://"
 "jru.jabberstudio.org/ pour le supprimer"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "N'eo ket bet roet ar ger-kuzh OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Luget e voc'h da %s hep OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Respont direizh"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Kevreadenn"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Gwiriekait ho lugadenn pe klaskit en-dro diwezhatoc'h"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4769,30 +4782,40 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Darempredoù"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr ""
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "échec lors de la publication de votre vCard"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Sellerien"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Dorioù"
 
@@ -4803,14 +4826,19 @@ msgstr "Ket er roll"
 
 # Traduction moins mauvaise mais pas terrible: binding=lier, attacher
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr ""
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr ""
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (ou python-pysqlite2) n'eo ket staliet. O kuitaat..."
@@ -4896,66 +4924,69 @@ msgid "eleven"
 msgstr "Dilemel"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr ""
 
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy
+#, fuzzy, python-format
 msgid "five past %(0)s"
 msgstr "Emezelañ war %s"
 
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy
+#, fuzzy, python-format
 msgid "ten past %(0)s"
 msgstr "Emezelañ war %s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy
+#, fuzzy, python-format
 msgid "quarter past %(0)s"
 msgstr "Emezelañ war %s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty past %(0)s"
 msgstr "Emezelañ war %s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty five past %(0)s"
 msgstr "Emezelañ war %s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr ""
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty five to %(1)s"
 msgstr "Emezelañ war %s"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty to %(1)s"
 msgstr "Emezelañ war %s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy
+#, fuzzy, python-format
 msgid "quarter to %(1)s"
 msgstr "Emezelañ war %s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy
+#, fuzzy, python-format
 msgid "ten to %(1)s"
 msgstr "Emezelañ war %s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy
+#, fuzzy, python-format
 msgid "five to %(1)s"
 msgstr "Emezelañ war %s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr ""
 
@@ -5026,228 +5057,228 @@ msgstr "Arouezenn zireizh en anv-ostiz."
 msgid "Invalid character in resource."
 msgstr ""
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "D_ihegerz"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Prest da flapiñ"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Prest da flapiñ"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Hegerz"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Hegerz"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "O lugañ"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "E_zvezant"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Ezlinenn"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Ezlinenn"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Diwelus"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Dianav"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "fazi"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "An daou"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Emezelañ"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Kasourien"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Kasour-ez"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Perzhidi"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Perzhiad-ez"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Gweladennerien"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Gweladenner-ez"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 #, fuzzy
 msgid "Owner"
 msgstr "_Perc'hener-ez"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 #, fuzzy
 msgid "Administrator"
 msgstr "_Merour-ez"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 #, fuzzy
 msgid "Member"
 msgstr "_Ezel"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "a zo aketus d'ar gaozeadenn"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "a ra un dra bennak all"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "a skriv ur gemennadenn..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "a zo paouezet da skrivañ ar gemennadenn"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s Ko"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Kas ur gemennadenn"
 msgstr[1] "Kas ur gemennadenn"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5263,11 +5294,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "fazi: dibosupl eo digeriñ %s evit lenn"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "Cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "o krouiñ titourva an istoradur"
@@ -5982,82 +6013,94 @@ msgid ""
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "N'eo ket bet roet ar ger-kuzh OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Luget e voc'h da %s hep OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Evit kenderc'hel da gas ha da resev kemennadennoù, e rankit lugañ en-dro."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 #, fuzzy
 msgid "Could not start local service"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr ""
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6068,95 +6111,95 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Dizoberiant"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Titour-stad"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Enaouiñ"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Anv"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Adlugañ bremañ?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Ret eo deoc'h adlugañ evit ma vo sevenet an holl gemmoù diouzhtu."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Darvoudoù chomet dilenn"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Rankout a rit bezañ diluget evit cheñch anv ar gont."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Rankout a rit lenn an holl zarvoudoù-mañ evit gellout cheñch anv ar gont."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6164,142 +6207,148 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Anv-kont direizh"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "N'hell ket anv ar gont chom goullo."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "Merañ ar c'hontoù"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber a rank bezañ er stumm \"anv@anvservijer\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Road direizh"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Bez ez eus bet ur gudenn en ur gargañ hoc'h alc'hwezhioù-kuzh OpenPGP."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Kont dihegerz"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Rankout a rit bezañ luget evit kemmañ ho titouroù hiniennel."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Rankout a rit bezañ diluget evit cheñch anv ar gont."
+
+#: ../src/config.py:2289
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Roll argas"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Roll an izili"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Roll ar verourien"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Abeg"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Lesanv"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Perzh"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Oc'h argas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6307,11 +6356,11 @@ msgstr ""
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6319,11 +6368,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6332,11 +6381,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6344,7 +6393,7 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6362,62 +6411,62 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6425,71 +6474,69 @@ msgstr ""
 "sined-mañ."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Road direizh"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Bez e c'hellit aozañ dibaboù araoket ar gont en ur pouezañ war an nozelenn "
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Rankout a rit reiñ un anv-arveriad-ez evit kefluniañ ar gont-mañ."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Darempred er roll dija"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6499,7 +6546,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6507,74 +6554,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Oberiant"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Darvoud"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Kemennadenn gentañ"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Darempred luget"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Darempred diluget"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Kemennadenn gaset"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6583,76 +6630,76 @@ msgstr ""
 "Dindan al linenn e welit ar pezh a zo bet lâret er sal-flapiñ dibaoe ar wech "
 "diwezhañ ho peus taolet ur sell ennañ."
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Kuitaat"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Mankout a ra un \"%s\" e-barzh URL ar geriaoueg, ha n'eo ket WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Mankout a ra un \"%s\" e-barzh URL ar webklask"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Dec'h"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i devezh 'zo"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Flaperez Jabber"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6688,21 +6735,21 @@ msgstr "Anv an darempred"
 msgid "Set Mood"
 msgstr "Lakaat MOTD"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Titour-stad %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6710,111 +6757,111 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Enrollañ evel titour-stad rakenrollet"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Roit un anv d'an titour-stad-mañ"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Chomlec'h 2:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Leuniit titouroù an darempred a zo da vezañ ouzhpennet er gont %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Leuniit an titouroù diwar-benn an darempred da ouzhpennañ"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "ID-arveriad-ez direizh"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Darempred er roll dija"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 #, fuzzy
 msgid "User ID:"
 msgstr "ID arveriad-ez:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Ur flaperez jabber e GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "TRUGAREZ DA:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Evit echuiñ, e fell deomp trugarekaat holl gempennerien ar pakad."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6823,95 +6870,105 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Goulenn enskrivañ evit ar gont %s digant %s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Goulenn enskrivañ digant %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ebarzhiñ ur sal-flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Anv-kont direizh"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Servijer"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6921,310 +6978,310 @@ msgstr ""
 "dezhañ:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Rankout a ra an daou c'her-kuzh bezañ heñvel en daou dakad."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Kemennadenn nevez"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Kemennadenn simpl nevez"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "%s resevet"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr ""
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Chomlec'h"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Kemmañ"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID Jabber:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Strollad"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Taolennadur: %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Rankout a rit reiñ ur ger-kuzh evit enrollañ ar gont nevez."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Dibabit ur son"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "An holl restroù"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Dibabit ur skeudenn"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Pa teu %s da vezañ:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 #, fuzzy
 msgid "Condition"
 msgstr "Kevreadenn"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7232,38 +7289,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7273,26 +7330,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7387,20 +7444,20 @@ msgstr "Taolennadur"
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Sined lakaet dija"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar sined"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Bez e c'hellit merañ ho sinedoù dre ar meuziad Oberoù er roll-darempredoù."
@@ -7415,15 +7472,15 @@ msgstr "Emezelañ"
 msgid "Node"
 msgstr "Hini ebet"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Koumanantiñ"
@@ -7866,33 +7923,33 @@ msgstr "Ezhomm en deus Gajim eus ur servijer X evit labourat. O kuitaat..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr ""
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7901,21 +7958,21 @@ msgstr ""
 "Dilamit al levraoueg red eus GTK+runtime ha staliit an aozadur stabil "
 "diwezhañ diwar %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7923,44 +7980,44 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Luget e voc'h da %s hep OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Ger-kuzh faos"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7971,184 +8028,190 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Aotre HTTP (%s) evit %s (id : %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Kevreadenn"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s : %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Goulenn koumanantiñ"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Aotreet oc'h bet gant \"%s\" da welet e stad."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Koumanantiñ"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "N'eus ket tu da dizhout \"%s\""
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s a zo bremañ %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Un mot de passe est requis pour rejoindre ce salon."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Direizh eo ho ker-kuzh"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Direizh eo ho ker-kuzh"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Chom hep goulenn ket"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Postel nevez war %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Bez ho peus %d postel nevez"
 msgstr[1] "Bez ho peus %d postel nevez"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8158,92 +8221,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Gant berzh ho peus resevet %(filename)s digant %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Gant berzh ho peus kaset %(filename)s da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Da _bep kemennadenn:"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8251,15 +8314,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8270,64 +8333,64 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Kevreadenn"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "N'hellit ket ebarzhiñ ur webgaoz keit ha m'emaoc'h diwelus."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
@@ -8363,12 +8426,13 @@ msgstr ""
 "A ziskouez ur roll eus an holl zarempredoù, pep darempred war ul linenn."
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "kont"
 
@@ -8393,9 +8457,9 @@ msgstr "stad"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "unan eus: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "kemennadenn"
 
@@ -8412,24 +8476,47 @@ msgstr ""
 "an holl gontoù o deus an dibab \"sync with global status\" enaouet"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "A cheñch stad ar gont pe ar c'hontoù"
+
+#: ../src/gajim-remote.py:120
+msgid "priority"
+msgstr ""
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"A cheñch stad ar gont \"kont\". Ma n'eus hini ebet roet, klaskit cheñch stad "
+"an holl gontoù o deus an dibab \"sync with global status\" enaouet"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "A ziskouez ar prenestr flapiñ evit ma c'hellfec'h kas ur gemennadenn d'un "
 "darempred"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8440,29 +8527,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "korf ar gemennadenn"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "alc'hwezh pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "Ma vez resisaet, e vo kaset ar gemennadenn en ur implij ar gont-mañ"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8473,221 +8560,221 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "subject"
 msgstr "Titl"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "message subject"
 msgstr "Kemennadenn gaset"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Evit kargañ titouroù-munut un darempred"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID an darempred"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Evit kargañ titouroù-munut ur gont"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Anv ar gont"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Kas ur restr d'un darempred"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "restr"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Treug ar restr"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "m'eo resisaet, e vo kaset ar rest en ur implij ar gont-mañ"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Roll an holl zibaboù hag o zalvoudoù"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "A laka talvoud an 'alc'hwezh' da 'dalvoud'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "alc'hwezh=talvoud"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'alc'hwezh' eo anv an dibab, 'talvoud' eo an talvoud da lakaat dezhañ"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "A zilam un elfenn dibab"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "touchenn"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "anv an dibab da zilemel"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "A skriv stad red dibaboù Gajim er restr .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Ouzhennañ an darempred d'ar roll"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Ouzhpennañ un darempred nevez d'ar gont-mañ."
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "A ro ar stad red (an hini hollek, nemet ez eus bet resisaet ur gont bennak)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "A gas an titour-stad red (an hini hollek, nemet ez eus bet resisaet ur gont "
 "bennak)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "A ro an niver a gemennadennoù chomet dilenn"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr ""
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "korf ar gemennadenn"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Ebarzhiñ ur webgaoz nevez"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "room"
 msgstr "Digant"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Webgaoz:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "nick"
 msgstr "Lesanv"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "password"
 msgstr "Ger-kuzh:"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8696,31 +8783,31 @@ msgstr ""
 "N'emañ ket '%s' en hor roll darempredoù.\n"
 "Resisait ar gont evit kas ur gemennadenn."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "N'eo ket bet kavet %s"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8729,21 +8816,21 @@ msgstr ""
 "Implij: %s urzhiad [arguments]\n"
 "urzhiad eo unan eus :\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Ger-kuzh faos"
@@ -8774,314 +8861,175 @@ msgstr "N'hellit ket dilemel ar gwiskadur red"
 msgid "Please first choose another for your current theme."
 msgstr "Dibabit ur gwiskadur all da gentañ."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "N'emaoc'h ket er webgaoz \"%s\" ken, pe neuze eo aet kuit \"%s\"."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Istoradur ar gaoz"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Kevreadenn"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo argaset gant %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr ""
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "N'eus ket bet kavet al lesanv : %s"
-
-#: ../src/groupchat_control.py:1530
-#, fuzzy
-msgid "This group chat has no subject"
-msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Darempred %(contact_jid)s bet pedet e-barzh %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "N'eus ket bet kavet al lesanv : %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Usage : /%s <surnom|JID> [raison], bannit le JID du salon. Le surnom de "
-"l'occupant peut être utilisé s'il ne contient pas de \"@\". Si le JID est "
-"actuellement dans le salon il sera également éjecté. Ne supporte pas les "
-"espaces dans le surnom."
-
-#: ../src/groupchat_control.py:1734
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
-"spécifié."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Usage : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la "
-"raison si spécifiée."
-
-#: ../src/groupchat_control.py:1746
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Usage : /%s <JID> [raison], invite le JID dans le salon actuel, la raison "
-"est optionnelle."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Usage : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur "
-"en option on peut spécifier le surnom utilisé."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Usage : /%s <surnom> [raison], supprime l'occupant portant le surnom "
-"spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
-"contenir d'espaces !"
-
-#: ../src/groupchat_control.py:1762
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
-"envoie le message à l'occupant(e) spécifié(e) par le surnom."
-
-#: ../src/groupchat_control.py:1767
-#, fuzzy, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
-
-#: ../src/groupchat_control.py:1771
-#, fuzzy, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
-
-#: ../src/groupchat_control.py:1775
-#, fuzzy, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Usage : /%s <message>, envoie un message sans chercher d'autres commandes."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ha sur oc'h e fell deoc'h kuitaat ar flap \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ma serrit ar prenestr-mañ, e tigevreoc'h diouzh ar flap-mañ."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Taolennadur: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
@@ -9153,6 +9101,15 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Enrollañ ar restr dindan..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Flap a-stroll"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Dibosupl eo kavout titourva an istoradur"
@@ -9231,53 +9188,62 @@ msgstr "Istoradur flapiñ gant %s"
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s a zo bremañ %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Fazi en ur lenn ar restr:"
+
+#: ../src/history_window.py:440
+msgid "Error"
+msgstr ""
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Ar stad a zo bremañ: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Flapoù"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Kemennadennoù"
 
@@ -9338,12 +9304,12 @@ msgstr "_Kenderc'hel"
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "Treug ar restr"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "Ce salon n'existe pas."
@@ -9351,7 +9317,7 @@ msgstr "Ce salon n'existe pas."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
@@ -9384,46 +9350,46 @@ msgstr ""
 "Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
 "diwezhatoc'h."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Kaset eo bet an aotre"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ma asant \"%s\" ar c'houmanant e weloc'h he/e stad."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Adalek bremañ e welo ac'hanoc'h \"%s\" atav evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Kemer a rit perzh e unan pe meur a webgaoz"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9431,28 +9397,28 @@ msgstr ""
 "Tremen d'ar stad diwelus a lakao ac'hanoc'h da zilugañ diouzh ar webkaozioù-"
 "se. Ha sur oc'h e fell deoc'h bezañ diwelus?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Êtes-vous sûr de vouloir quitter les salons \"%s\" ?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Kemennadennoù nevez ho peus"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9460,17 +9426,17 @@ msgid ""
 msgstr ""
 "Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9479,12 +9445,12 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9493,62 +9459,73 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Darempredoù"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Dilemel"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Dibabit un alc'hwezh da"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9557,12 +9534,12 @@ msgstr ""
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9570,17 +9547,17 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit dre-ziouer he/e aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Aotreañ an darempred-mañ da welout ma stad war-lerc'h e zilam"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9589,55 +9566,68 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Restr direizh"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Fellout a ra da %s kas deoc'h ur restr:"
 msgstr[1] "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Kas %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Strollañ %s ha %s"
@@ -9647,127 +9637,138 @@ msgstr "Strollañ %s ha %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "en ur implij ar gont %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "d'ar gont %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "en ur implij ar gont %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Merañ ar sinedoù..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "eus ar gont %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "evit ar gont %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Embann"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Dizoleiñ ar servijoù..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilisateurs En _Ligne"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Darempredoù"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Kemmañ ar _strolladoù"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Kas ur gemennadenn simpl"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr ""
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Dorioù"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Dorioù"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Adenvel"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "Darempred diluget"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "Flap a-stroll"
+msgid "_Disconnect"
+msgstr "Darempred diluget"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Kemmañ an titour-stad..."
 
@@ -9784,20 +9785,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Sujed: %s\n"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9807,7 +9808,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10000,6 +10001,136 @@ msgstr ""
 msgid " resource with priority "
 msgstr ""
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Ouzhpennañ ur gelaouenn _ispisial"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Urzhioù: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Usage : /%s, nettoie la fenêtre."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Usage: /%s, cache les boutons de discussion."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Usage : /%s <action>, envoie l'action au salon actuel. Utilise la "
+#~ "troisième personne. (ex : /%s explose.)"
+
+#, fuzzy
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr ""
+#~ "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte."
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Usage: /%s, cache les boutons de discussion."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "N'eus skoazell hegerz ebet evit /%s"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "N'eus ket bet kavet al lesanv : %s"
+
+#, fuzzy
+#~ msgid "This group chat has no subject"
+#~ msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Darempred %(contact_jid)s bet pedet e-barzh %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "N'eus ket bet kavet al lesanv : %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Usage : /%s <surnom|JID> [raison], bannit le JID du salon. Le surnom de "
+#~ "l'occupant peut être utilisé s'il ne contient pas de \"@\". Si le JID est "
+#~ "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
+#~ "espaces dans le surnom."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec "
+#~ "l'occupant spécifié."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Usage : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant "
+#~ "la raison si spécifiée."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Usage : /%s <JID> [raison], invite le JID dans le salon actuel, la raison "
+#~ "est optionnelle."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Usage : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
+#~ "salon@serveur en option on peut spécifier le surnom utilisé."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Usage : /%s <surnom> [raison], supprime l'occupant portant le surnom "
+#~ "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
+#~ "contenir d'espaces !"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
+#~ "envoie le message à l'occupant(e) spécifié(e) par le surnom."
+
+#, fuzzy
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
+
+#, fuzzy
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr ""
+#~ "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Usage : /%s <message>, envoie un message sans chercher d'autres commandes."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
+
 #, fuzzy
 #~ msgid "Servers Features"
 #~ msgstr "Perzhioù ar servijerien"
diff --git a/po/cs.po b/po/cs.po
index d50798e5d..b6d2479c0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:44+0200\n"
 "Last-Translator: Petr Menšík <pihhan@cipis.net>\n"
 "Language-Team:  <>\n"
@@ -227,6 +227,7 @@ msgstr "<b>Osobní údaje</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Účet"
 
@@ -292,8 +293,8 @@ msgstr "Upravit osobní informace..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -304,8 +305,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Obecné"
 
@@ -363,25 +364,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informace o Vás, jak jsou uloženy na serveru"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Žádný"
 
@@ -536,8 +533,8 @@ msgstr ""
 "Můžeš také zvážit změnu nastavení firewallu."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -551,7 +548,7 @@ msgid "Mer_ge accounts"
 msgstr "_Spojit účty"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Přejme_novat"
 
@@ -801,7 +798,7 @@ msgid "All statuses"
 msgstr "Všechny stavy"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Pryč"
 
@@ -818,7 +815,7 @@ msgid "Have "
 msgstr "Má"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Neviditelný"
 
@@ -827,7 +824,7 @@ msgid "Launch a command"
 msgstr "Provést příkaz"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Nedostupný"
 
@@ -1013,7 +1010,7 @@ msgid "Join _Group Chat"
 msgstr "Vstoupit do _Diskuze"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "Přid_at do Seznamu"
 
@@ -1039,39 +1036,6 @@ msgstr "_Otevřít v prohlížeči"
 msgid "_Start Chat"
 msgstr "_Začít rozhovor"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Pozvat kontakt"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Odeslat _Soubor"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Přepnout šifrování mezi uživateli"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Přepnout Open_PGP šifrování"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "Přid_at do Seznamu"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Historie"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "_Pozvat do"
@@ -1096,6 +1060,119 @@ msgstr ""
 "Začátek Více-uživatelského rozhovoru.\n"
 "Vyberte kontakty, které chcete pozvat"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Požádat o zobrazení je(jí)ho _stavu"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Přidat zvláštní _upozornění"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Přiřadit Open_PGP Klíč..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Provést příkaz..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Upravit _skupiny"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "_Pozvat do"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Pozvat kontakt"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "Odst_ranit"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Poslat vlastní stav"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Odeslat jednoduchou _zprávu..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Odeslat _Soubor"
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Nastavit vlastní Avatar"
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Začít _rozhovor"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Přepnout šifrování mezi uživateli"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Přepnout Open_PGP šifrování"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Dovol kontaktu vidět můj stav"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Blokovat"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Zakaž mu/jí vidět můj stav"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Historie"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignorovat"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Spravovat kontakt"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Přejmenovat"
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Autorizace"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Odblokovat"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Neignorovat"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Vyplňte formulář."
@@ -1213,7 +1290,7 @@ msgstr ""
 "Řádek kontaktu\n"
 "Nadpis rozhovoru"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Tučné"
 
@@ -1237,7 +1314,7 @@ msgstr "Pryč"
 msgid "Inactive"
 msgstr "Neaktivní"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Latinka"
 
@@ -1310,6 +1387,14 @@ msgstr "Mo_derátor"
 msgid "Occupant Actions"
 msgstr "_Akce účastníků"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Odeslat _Soubor"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "Přid_at do Seznamu"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Správce"
@@ -1318,13 +1403,6 @@ msgstr "_Správce"
 msgid "_Ban"
 msgstr "_Zakázat"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Blokovat"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "Vy_kopnout"
@@ -1341,13 +1419,6 @@ msgstr "_Vlastník"
 msgid "_Send Private Message"
 msgstr "_Odeslat soukromou zprávu"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Odblokovat"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Hlas"
@@ -1356,7 +1427,7 @@ msgstr "_Hlas"
 msgid "Create new post"
 msgstr "Vytvoř nový zápis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Odesílatel"
 
@@ -1380,8 +1451,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Vítejte do Gajimova Správce Historie</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Smazat"
 
@@ -1434,34 +1505,39 @@ msgstr "Najít:"
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Přidat tuto místnost do záložek"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Připoj se do této místnosti automaticky po připojení"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Přezdívka:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Nedávno:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Vstoupit"
@@ -1490,7 +1566,7 @@ msgstr "Minimalizovat po připojení"
 msgid "Print status:"
 msgstr "Vypiš stav:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2026,7 +2102,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Seřadit podle stavu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Stav"
 
@@ -2195,34 +2271,39 @@ msgid "All"
 msgstr "Vše"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "všechny podle autorizace"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Povolit"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Pořadí:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Nastavení Soukromí"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "všechny podle autorizace"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "všem ve skupině"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2234,19 +2315,19 @@ msgstr ""
 "ode mě\n"
 "ke mě"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "odeslat zprávu"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "pro zaslání dotazu"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "Požádat o zobrazení je(jí)ho stavu"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "Dovol mu/jí vidět můj stav"
 
@@ -2414,96 +2495,11 @@ msgstr "Odstranit účet z Gajimu i ze _serveru"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "Odst_ranit"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Požádat o zobrazení je(jí)ho _stavu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Přidat zvláštní _upozornění"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Přiřadit Open_PGP Klíč..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Upravit _skupiny"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Provést příkaz..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "_Pozvat do"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "Odst_ranit"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Poslat vlastní stav"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Odeslat jednoduchou _zprávu..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Odeslat _Soubor"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Nastavit vlastní Avatar"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Začít _rozhovor"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Dovol kontaktu vidět můj stav"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Zakaž mu/jí vidět můj stav"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignorovat"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Spravovat kontakt"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Přejmenovat"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Autorizace"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Neignorovat"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2624,7 +2620,7 @@ msgid "_Add contact"
 msgstr "Přidat _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "Informace o kontaktu"
 
@@ -2836,26 +2832,6 @@ msgstr "_Zpráva"
 msgid "_Presence"
 msgstr "_Stav"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Přidat zvláštní _upozornění"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Přiřadit Open_PGP klíč"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Upravit _skupiny"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Přejmenovat"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Upravit úč_et..."
@@ -2899,48 +2875,48 @@ msgid "Service returned an error."
 msgstr "Služba vrátila chybu."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Aktivní"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Neaktivní"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Číslo"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Barva"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Název volby"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Žádný)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Skryté"
 
@@ -2954,184 +2930,183 @@ msgstr "Dostal(a) jste novou položku: "
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Angličtina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Běloruština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulharština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretonština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Němčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Řečtina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Britština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Španělština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Baskičtina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Francouzština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Chorvatština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norština (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Holandština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugalština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brazilská portugalština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Srbština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovenština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Švédština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Čínština"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Kontrola jazyka"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Va¹e zpráva nemù¾e být odeslána dokud se nepøipojíte."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 msgid "Underline"
 msgstr "Podtrhnout"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 msgid "Strike"
 msgstr "Přeškrtnout"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 msgid "Clear formating"
 msgstr "Smazat formátování"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Opravdu odeslat soubor?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Pokud odešlete soubor %s, tak bude znát vaše skutečné Jabber ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG Šifrování zapnuto"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Není v Rosteru"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Seznam aktivních, dokončených a zastavených přenosů souborů"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Neznámý Umělec"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Neznámý Název"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Neznámý Zdroj"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3140,17 +3115,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskuze %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Nepřiřazen GPG klíč"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3158,50 +3133,50 @@ msgstr ""
 "Tento kontakt nemá přiřazen GPG klíč. Proto nemůžeš šifrovat pomocí GPG "
 "zprávy."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG Šifrování vypnuto"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Sezení BUDE logováno"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Sezení NEBUDE logováno"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "NENÍ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "NEBUDE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "a autentizovaný"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "a NEautentizovaný"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3210,106 +3185,62 @@ msgstr ""
 "Šifrování %(type)s %(status)s aktivní %(authenticated)s.\n"
 "Váš rozhovor %(logged)s zaznamenáván."
 
-# FIXME: co je zeroconf?
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Příkaz není podporován pro zeroconf účet."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Příkazy: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Použití: /%s, smaže zprávy v okně."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Použití: /%s, skryje tlačítka rozhovoru."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Použití: /%(command)s <akce>, pošle akci do aktuální místnosti. Použijte "
-"třetí osobu (například /%(command)s explodoval.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Použití: /%s, pošle ping kontaktu"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Použití: /%s, pošle zprávu kontaktu"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Žádná další nápověda pro /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Sezení bylo zrušeno"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Toto sezení je šifrované"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr "a BUDE zaznamenáváno"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr "a NEBUDE zaznamenáváno"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "Kontakt nebyl ověřen. Klikněte na tlačítko štítu pro více informací."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E Šifrování vypnuto"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Následující zpráva NEBYLA šifrovaná"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Následující zpráva byla šifrovaná"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Právě jsi obdržela novou zprávu od \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Pokud zavřete toto okno a historie je vypnutá, tato zpráva bude ztracena."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Chyba Databáze"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3318,7 +3249,7 @@ msgstr ""
 "Nelze přečíst soubor databáze (%s). Opravte ho nebo smažte (tím ztratíte "
 "všechny zprávy v historii)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je nyní %(status)s"
@@ -3327,23 +3258,23 @@ msgstr "%(name)s je nyní %(status)s"
 msgid "creating logs database"
 msgstr "vytvářím databázi historie"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je soubor, ale měl by být adresář"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim se nyní ukončí"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je adresář, ale měl by to být soubor"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvářím adresář %s "
@@ -3407,9 +3338,9 @@ msgstr "Vyber diskuze, které chceš opustit"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Diskuze"
 
@@ -3425,72 +3356,113 @@ msgstr "Přeposlat nepřečtené zprávy"
 msgid "All unread messages have been forwarded."
 msgstr "Všechny nepřečtené zprávy byly přeposlány."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Používej DBus a Notifikačního démona k zobrazování notifikací"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Zobraz v rosteru pouze online kontakty nebo kontakty hledající pokec."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na pryč."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Pryč z důvodu nečinosti po více než $T minut)"
 
 # FIXME: asi blbe
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr "$S bude změněn na aktuální stav, čas: $T"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na nedostupný."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nedostupný z důvodu nečinosti po více než $T minut)"
 
 # FIXME: asi blbe
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S bude změněn na aktuální stav, čas: $T"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Kdy zobrazit ikonu v oznamovací oblasti. Může být jedno z nikdy='never', při "
 "události='on_event', vždy='always'."
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Neplatné uživatelské jméno"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "text stavu"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Neplatné uživatelské jméno"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Měním přezdívku"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "text stavu"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Seznam (oddělené mezerami) řádků (účtů a skupin), které budou \"zhroucené\"."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "výchozí"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Povolit lokální zprávy typu zeroconf"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Jazyk použitý kontrolou pravopisu"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3500,7 +3472,7 @@ msgstr ""
 "'někdy' - vypiš čas každou print_ichat_every_foo_minutes minutu.\n"
 "'nikdy' - nevypisuj čas."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3510,17 +3482,17 @@ msgstr ""
 "to 4, nebo 0 pro vypnutí Fuzzy Clock. 1 je nejpřesnější čas, 4 nejméně "
 "přesný. Toto se použije jenom při print_time nastaveném na 'někdy'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Ber * / _ páry jako možné formátovací znaky."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Pokud zapnuto, nemažte */_ . Potom *abc* bude tučně ale s * * neodstraněnými."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3531,7 +3503,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (Pokud si to chcete prohlédnout, "
 "nainstalujte docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3539,7 +3511,7 @@ msgstr ""
 "Znak, který se přidá za přezdívku po použití doplňování jména tabulátorem v "
 "diskuzi."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3547,7 +3519,7 @@ msgstr ""
 "Znak navržený pro přidání za zamýšlenou přezdívku, pokud už ji používá někdo "
 "jiný v diskuzi."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3558,19 +3530,19 @@ msgstr ""
 "informací shlédněte dokumentaci pythonu funkce strftime na: http://docs."
 "python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaky, které budou vypisovány před přezdívkou v rozhovorech"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaky, které budou vypisovány za přezdívkou v rozhovorech"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Přidat * a [n] k titulku Seznamu?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3578,11 +3550,25 @@ msgstr ""
 "Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka "
 "rozhovoru znovu otevřena."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kolik minut by měly řádky z předchozího rozhovoru zůstat."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3590,11 +3576,11 @@ msgstr ""
 "Odeslat zprávu při Ctrl+Enter a při Enter přejít na nový řádek (výchozí "
 "chování klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolik řádků uložit pro Ctrl+Šipka nahoru."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3603,11 +3589,11 @@ msgstr ""
 "Buď vlastní url s %s v těle, kde %s je slovo nebo fráze, nebo 'WIKTIONARY', "
 "která znamená že se použije wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Pokud zaškrtnuta, Gajim může být ovládán vzdáleně pomocí gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3619,14 +3605,14 @@ msgstr ""
 "synchronizují se s globálním stavem) v závislosti na stavu síťového "
 "připojení."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
 "vypnutá."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3634,7 +3620,7 @@ msgstr ""
 "Zobraz stavy rozhovoru v okně rozhovoru. Může být jedno z all, "
 "composing_only nebo disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3642,11 +3628,11 @@ msgstr ""
 "Když nevypisuji čas pro každou zprávu (print_time=='někdy'), vypisuj ji "
 "každých x minut."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ptát se před zavřením oken/záložek diskuzí."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3654,7 +3640,7 @@ msgstr ""
 "Vždy se ptát před zavřením oken/panelů diskuzí uvedených v tomto seznamu "
 "mezerami oddělením Jabber ID místností."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3662,13 +3648,13 @@ msgstr ""
 "Nikdy se neptát před zavřením oken/záložek diskuzí uvedených v tomto seznamu "
 "mezerami oddělenými Jabber ID místností."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3677,27 +3663,27 @@ msgstr ""
 "rozhraním, pro přenos souborů v případě překladu adres nebo přesměrováním "
 "portů."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Upozorni na události v systémovém trayi."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobrazit okraj panelu v oknech rozhovorů?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3708,16 +3694,16 @@ msgstr ""
 "oddělené čárkami. Povolené skupiny jsou 1, 2, 5, 14, 15, 16, 17 a 18. Vyšší "
 "čísla jsou více bezpečná, ale vyžadují delší dobu výpočtu při startu sezení."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3725,14 +3711,14 @@ msgstr ""
 "Pokud zapnuto, ukonči Gajim když bude stisknuto tlačítko X v titulku okna. "
 "Toto nastavení se použije pouze tehdy, pokud je použita ikona v trayi."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Pokud zapnuto, Gajim zkontroluje, zda je výchozí jabber klient, při každém "
 "startu."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3740,7 +3726,7 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené "
 "zprávy. V závislosti na tématu, tato ikona může být animovaná."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3748,11 +3734,11 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý "
 "kontakt pod jménem v okně Seznamu."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Nastavení pozice avatara v rosteru. Může být vlevo nebo vpravo"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3760,7 +3746,7 @@ msgstr ""
 "pokud zapnuto, Gajim se zeptá na avatara každého kontaktu který neměl "
 "naposledy avatara nebo kterého uložený je příliš starý."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3768,7 +3754,7 @@ msgstr ""
 "Pokud vypnuto, Gajim nebude zobrazovat stavové řádky v rozhovorech, když "
 "kontakt změní jeho stav a/nebo jeho stavovou zprávu."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3781,29 +3767,29 @@ msgstr ""
 "stavovou zprávu. Pokud je \"all\", Gajim bude vypisovat všechny změny stavů. "
 "Při \"in_and_out\" Gajim vypíše stav jenom při vstupu a odchodu z místnosti."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Barva pozadí kontaktů, jež se zrovna přihlásili."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Barva pozadí kontaktů, jež se přávě odhlásili."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Pokud je povoleno, minulé zprávy budou vypsány menším písmem, než je výchozí."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazuj avatara pro transport samotný."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Nezobrazuj roster v liště úloh."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3813,7 +3799,7 @@ msgstr ""
 "oknem (výchozí chování ve většině Window Managerů) pokud čekají nové "
 "události."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3824,7 +3810,7 @@ msgstr ""
 "neposílala v presenci u diskuzí."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3843,31 +3829,31 @@ msgstr ""
 "zvláštního okna. Vězte, že změna této volby vyžaduje restartování Gajimu, "
 "aby se projevila"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Pokud je False, nebudete nadále vidět avatary v okně rozhovoru"
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Pokud je True, stiskem escape zavřete panel nebo okno"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Skryje tlačítka v okně diskuze."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Skryje nadpis v okně diskuze"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryje nadpis v okně rozhovoru dvou lidí"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skryje seznam lidí místnosti v okně diskuze."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3876,15 +3862,15 @@ msgstr ""
 "stejný člověk, jako v předchozí zprávě."
 
 # FIXME: netusim co to je... najit
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Jemné posouvání v okně diskuze"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3892,11 +3878,11 @@ msgstr ""
 "Seznam barev, oddělený pomocí \":\", použitý k obarvení přezdívek v "
 "diskuzích."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab jde na další rozepsanou záložku, když žádný není nepřečtená."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3904,7 +3890,25 @@ msgstr ""
 "Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec znamená "
 "nikdy nezobrazovat dialog."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec znamená "
+"nikdy nezobrazovat dialog."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec znamená "
+"nikdy nezobrazovat dialog."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3914,7 +3918,7 @@ msgstr ""
 "BUĎ OPATRNÝ, když jsi přihlášen se zápornou prioritou, nedostaneš od serveru "
 "žádnou zprávu."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3922,7 +3926,7 @@ msgstr ""
 "Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel "
 "k účtům."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3931,7 +3935,7 @@ msgstr ""
 "Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel "
 "k účtům."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3939,7 +3943,7 @@ msgstr ""
 "Je-li povoleno, Gajim zobrazí počet dostupných a všech kontaktů v účtu a u "
 "řádků skupin."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3947,7 +3951,7 @@ msgstr ""
 "Může být prázdný, 'chat' nebo 'message'. Není-lí prázdné, považuj všechny "
 "příchozí zprávy jako uvedený typ"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3955,7 +3959,7 @@ msgstr ""
 "Je-li povoleno, Gajim bude posune a vybere kontakt, který vám poslal "
 "poslední zprávu, pokud již okno rozhovoru není otevřené."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3963,11 +3967,11 @@ msgstr ""
 "Je-li povoleno, Gajim převede řetězec mezi $$ a $$ na obrázek pomocí dvips a "
 "převede před vložením do okna rozhovoru."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Čas neaktivity před zavřením okna změny stavu."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3975,18 +3979,18 @@ msgstr ""
 "Maximální počet řádků, které se vypíší v konverzacích. Nejstarší řádky jsou "
 "smazány."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 "Je-li povoleno, Upozorňovací démon přidá upozornění do systémové lišty."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Vyberte interval mezi dvěma stavy nečinnosti."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3994,7 +3998,7 @@ msgstr ""
 "Změnou hodnoty změníte velikost zobrazovaných formulí latexu. Vyšší znamená "
 "větší."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4003,13 +4007,23 @@ msgstr ""
 "Platná uri schémata. Pouze schémata v tomto seznamu budou akceptována jako "
 "\"správné\" URI. (mailto a xmpp jsou obsluhovány zvlášť)"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4017,7 +4031,7 @@ msgstr ""
 "Priorita se změní automaticky podle tvého stavu. Priority jsou definovány v "
 "nastavení jako položky autopriority_*."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4026,26 +4040,37 @@ msgstr ""
 "'nedostupný', 'nerušit', 'neviditelný'. POZNÁMKA: toto nastavení může být "
 "použito pouze pokud restore_last_status je vypnutý"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Je-li povoleno, nastaví se vždy poslední použitý stav."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Pokud je False, nebudete nadále vidět avatary v okně rozhovoru"
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Je-li zakázáno, spojení nebude podepsané GPG klíčem, pokud je GPG klíč "
 "nastavený."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Povolit ESessions šifrování pro tento účet."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Má se Gajim automaticky připojovat šifrovaným spojením je-li to možné?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4053,28 +4078,28 @@ msgstr ""
 "Řazený seznam (oddělený mezerami) spojení, která má Gajim zkusit. Možnosti "
 "jsou: tls, ssl nebo plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Zobrazit varování před použitím standartní SSL knihovny."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mezerami oddělovaný seznam ssl chyb, které se mají ignorovat."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4084,11 +4109,11 @@ msgstr ""
 "pokusit o připojení."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4096,15 +4121,15 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve "
 "volbě pro přenos souborů file_transfer_proxies."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Odpověď na doručení žádosti"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Poslat žádost"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4112,112 +4137,112 @@ msgstr ""
 "Pokud sestavuji šifrované sezení, má Gajim přepokládat povolení "
 "zaznamenávání zpráv?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je OpenPGP povoleno pro tento kontakt?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 "Má Gajim uskutečnit šifrované spojení s tímto kontaktem je-li k dispozici?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "všechny nebo mezerou oddělené stavy"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', nebo 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' nebo ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4225,97 +4250,97 @@ msgstr ""
 "Zvuk, který bude přehrán, pokud zpráva diskuze obsahuje jedno ze slov v "
 "muc_highlight_words, nebo když obsahuje Vaši přezdívku."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Přehraný zvuk při příchodu jakékoliv MUC zprávy."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "mariňák"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Nelze nahrát idle modul"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Nesprávné jméno počítače"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Neplatná místní adresa? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrační informace pro transport %s nedorazily včas"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 msgid "Registration succeeded"
 msgstr "Registrace úspěšná"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, fuzzy, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrace úspěšná"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 msgid "Registration failed"
 msgstr "Registrace selhala"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Chyba zápisu na disk (možná je plný?)"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Neviditelnost není podporována"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditelnost."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Přišla zpráva od neplatného JID a byla ignorována."
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4324,77 +4349,84 @@ msgstr ""
 "Nelze přečíst soubor databáze (%s). Opravte ho (viz http://trac.gajim.org/"
 "wiki/DatabaseBackup) nebo smažte (tím ztratítu všechny zprávy v historii)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Přezdívka nepovolena: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Máš zakázán přístup do diskuze %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Diskuze %s neexistuje."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Vytváření místností není povoleno."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Musí být použita přezdívka, jež máte zaregistrovánu v diskuzi %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nejsi v seznamu členů diskuze %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Místnost byla zničena"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Můžete se připojit do této místnosti: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "jsme nyní zapsáni k %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Žádost o zrušení autorizace od %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "byla nám zrušena autorizace od %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4403,219 +4435,205 @@ msgstr ""
 "JID %s neodpovídá RFC. Nebude přidáno do tvého rosteru. Použij nástroje pro "
 "správu rosteru jako je http://jru.jabberstudio.org/ k jeho odstranění"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP heslo nebylo zadáno"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Budete připojen(a) k %s bez OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Nepodařilo se získat certifikát vydavatele"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Nepodařilo se získat certifikát CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodařilo se dešifrovat podpis certifikátu"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodařilo se dešifrovat podpis CRL certifikátu"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Nepodařilo se dešifrovat veřejný klíč vydavatele"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Chyba podpisu certifikátu"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Chyba podpisu CRL certifikátu"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Certifikát není správný"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL certifikát není správný"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "Platnost CRL certifikátu vypršela"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Chyba certifikátu v poli: platnost před"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Chyba certifikátu v poli: platnost po"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Chyba CRL certifikátu v poli: poslední aktualizace"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Chyba CRL certifikátu v poli: příští aktualizace"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Sám sebou podepsaný certifikát v certifikačním řetězci "
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Nepodařilo se získat certifikát lokálního vydavatele"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Nepodařilo se ověřit první certifikát"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Certifikační řetězec je přiliš dlouhý"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Certifikát je zrušený"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Překročena delká cesty"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Nepodporované osvědčení certifikátu"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Certifikát je nedůvěryhodný"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Certifikát odmítnut"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Neshoduje se název vydavatele"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Název klíče se neshoduje s Autoritou"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Vydavatelovo sériové číslo se neshoduje s Autoritou"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Použítý klíč neobsahuje podpis certifikátu"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Ověřování aplikace skončilo neúspěchem"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Znovu připojit ručně."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %s odpověděl chybně na požadavek regisrace: %s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytnul rozdílný registrační formulář"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznámá SSL chyba: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s odpověděl chybně na požadavek registrace: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Uloženo do: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Spojení s proxy selhalo"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Selhalo připojení k účti %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Spojení s účtem %s bylo ztraceno. Opět se připojte."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentizace certifikátu %s je neplatná."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4624,7 +4642,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4633,24 +4651,24 @@ msgstr ""
 "\n"
 "Neznámá SSL chyba: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Chyba při odebírání privacy listu"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4659,31 +4677,31 @@ msgstr ""
 "Privacy list %s nebyl odstraněn. Možná je aktivní v jednom z připojených "
 "zdrojů. Zruště jeho používání a zkuste znovu."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Není možné poslat zprávu kontaktu %s, takové JID není platné."
 
 # FIXME: co to je?
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Není podepsaná přítomnost ani není přiřazen klíč."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "Klíč kontaktu (%s) se neshoduje s klíčem v Gajimu."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tato zpráva je *zašifrovaná* (Viz :XEP:\"27\")]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4692,30 +4710,40 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Pozvat kontakt"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Nestáhnuto z důvodu stavu neviditelnosti"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Registrace selhala"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Přihlížející"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transporty"
 
@@ -4724,14 +4752,19 @@ msgid "Not in roster"
 msgstr "Není v rosteru"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings chybí na tomto počítači"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Možnosti D-Bus nemohou být použity"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
@@ -4806,56 +4839,69 @@ msgid "eleven"
 msgstr "jedenáct"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s hodin"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "pět po %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "deset po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "čtvrt po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "dvacet po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "twenty five past %(0)s"
 msgstr "dvacet pět po $%"
 
 #: ../src/common/fuzzyclock.py:46
+#, fuzzy, python-format
 msgid "half past %(0)s"
 msgstr "půl %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "dvacet pět do %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "dvacet do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "tři čtvrtě na %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "za deset %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "za pět %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s hodin"
 
@@ -4923,190 +4969,190 @@ msgstr "Neplatný znak v hostname."
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Nerušit"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "Přip_ojen"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Připojen"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "_Pryč"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Oboustranná"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Není"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Žádná"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Správce"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "píše zprávu..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5114,22 +5160,22 @@ msgstr[0] "Čeká %d zpráva"
 msgstr[1] "Čekají %d zprávy"
 msgstr[2] "Čeká %d zpráv"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr "z místností %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr "od uživatele %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5137,12 +5183,12 @@ msgstr[0] "Čeká %d událost"
 msgstr[1] "Čekají %d události"
 msgstr[2] "Čeká %d událostí"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, fuzzy, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "chyba při odesílání %(message)s ( %(error)s )"
@@ -5158,11 +5204,11 @@ msgstr "%s není platný loglevel"
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "azurová"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "převádím záznamy historie k použítí indexů"
 
@@ -5845,7 +5891,7 @@ msgid ""
 msgstr "Možná máš puštěnou jinou instanci Gajimu. Přenos souborů bude zrušen."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5853,7 +5899,7 @@ msgstr ""
 "[Tato zpráva je součástí šifrovaného sezení. Pokud vidíte tuto zprávu, tak "
 "je něco špatně.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5862,16 +5908,28 @@ msgstr ""
 "Host %s nastevený jako ft_add_hosts_to_send má rozšířenou volbu chybnou, "
 "bude ignorována."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP heslo nebylo zadáno"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Budete připojen(a) k %s bez OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pro pokračování v přijímání a odesílání zpráv se musíte znovu připojit."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5880,31 +5938,31 @@ msgstr ""
 "%s\n"
 "Zasílání lokálních zpráv nemusí fungovat správně."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Zkontrolujte zda je Avahi nebo Bonjour nainstalováno."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Nepodařilo se spustit lokální službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemůžu naslouchat na portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Zkontrolujte, zda avahi-daemon běží."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nemůžu změnit stav účtu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5912,20 +5970,20 @@ msgstr ""
 "Nejsi připojen nebo viditelný pro ostatní. Tvoje zpráva nemůže být odeslána."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Tato zpráva je zašifrovaná]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Vaše zpráva nemohla být odeslána."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je offline. Vaše zpráva nemohla být odeslána."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Spojení k počítači nebylo navázáno:Vypršel čas při odesílání dat."
@@ -5936,24 +5994,24 @@ msgstr "Spojení k počítači nebylo navázáno:Vypršel čas při odesílání
 msgid "Error while adding service. %s"
 msgstr "Chyba při přidávání služby. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Výchozí Zpráva"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Povolit"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pro jazyk %s není dostupný"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5962,206 +6020,212 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "text stavu"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Připojit se teď znovu?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Pokud chcete, aby se změny projevily ihned, musíte se znovu přihlásit."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP na tomto počítači není použitelné"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Nepřečtené zprávy"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Přečtěte si všechny čekající zprávy, než smažete tento účet."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otevřel(a) jsi rozhovor z účtu %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "Před změnou jména účtu si musíte přečíst všechny čekající zprávy."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Toto jméno je už použito pro jiný účet. Zvolte jiné, prosím."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Přejmenovat účet"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadej nové jméno pro účet %s."
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí být ve tvaru \"uživatel@jménoserveru\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Nastala chyba při získávání Vašich OpenPGP privátních klíčů."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Musíte vytvořit účet před úpravou vašich osobních údajů."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Váš server nepodporuje vizitky."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumí uložit Vaše osobní informace."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Ke změně jména účtu se musite odpojit."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Prosím přejmenujte nebo odstraňte před povolením lokálních zpráv."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6169,37 +6233,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát členem?</b>\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát vlastníkem?</b>\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát správcem?</b>\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6217,58 +6281,58 @@ msgstr ""
 "uživatel@doména),\n"
 "doména/zdroj, nebo adresa obsahující poddoménu."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Všechny"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Pouze při vstupu a výstupu"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:Žádný"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Nová diskuze"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6276,65 +6340,64 @@ msgstr ""
 "záložku."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Přezdívka nepovolena: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Můžete nastavit rozšířené volby účtu po stisknutí tlačítka Rozšířené, nebo "
 "později stisknutím v položce menu Účty v nabídce Úpravy hlavního okna."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Musíte zadat uživatelské jméno před nastavením tohoto účtu."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Prosím zadejte server u kterého se chcete zaregistrovat."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Certifikát je již v souboru"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Tento certifikát je již v souboru %s, takže nebude znova přidán."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, fuzzy, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6349,7 +6412,7 @@ msgstr ""
 "SSL Chyba: %s\n"
 "Přesto se chcete připojit na tento server?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6360,63 +6423,63 @@ msgstr ""
 "SHA1 otisk certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Další zpráva přijata zvýrazněná"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Další zpráva přijata nezvýrazněná"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Přišel GMail Email"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6426,7 +6489,7 @@ msgstr ""
 "stranou. Pokud zůstává dlouho, zpráva je pravděpodobně\n"
 "ztracena."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6435,74 +6498,74 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této "
 "diskuze"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Konec"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chybí \"%s\" a není to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Otevřít jako _Odkaz"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je již na seznamu"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber ID je již na seznamu. Vyberte jiné."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6537,125 +6600,125 @@ msgstr "Jméno kontaktu"
 msgid "Set Mood"
 msgstr "Nastavit Náladu"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Přepsat Text stavu?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Toto jméno je již použito. Chcete přepsat text stavu?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Uložit jako přednastavený stav"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Napište jméno pro tento stav"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG číslo: "
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ číslo: "
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje kontaktu, který chcete přidat do účtu %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ verze: "
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK verze: "
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Aktivní vývojáři:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "DÍKY:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Poslední, nikoliv nejmenší, poděkování patří všem správcům instalačních "
 "balíčků."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Petr Menšík <pihhan@seznam.cz>\n"
 "scippio <scippio@berounet.cz>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6666,88 +6729,98 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Žádost o autorizaci na účtu %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Neplatné jméno účtu"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Účet z kterého chcete vstoupit do místnosti"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Neplatné Jabber ID diskuzní místnosti"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Tohle není diskuze"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s není jméno diskuze."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Tento účet není připojen k serveru"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemůžete synchronyzovat účet pokud nění připojen."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Synchronizovat"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6755,300 +6828,300 @@ msgstr ""
 "Vyplňte Jabber ID nebo přezdívku kontaktu, se kterým chcete začít rozhovor:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím ujistěte se že jste připojen s účtem \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Neplatné JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nemůžu dekódovat \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt změnil stav"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Od %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Konzole"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Chtěl(a) bych si Vás přidat do mého Seznamu."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Adresa"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Náladový"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Skupina"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Soukromý seznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Pořadí: %s, akce: %s, typ: %s, hodnota: %s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Pořadí: %(order)s, akce: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upravit pravidlo</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Přidat pravidlo</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Soukromý Seznam"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Neplatné jméno seznamu"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte zadat jméno pro vytvoření privacy listu."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Jste pozván do diskuze"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete přijmout pozvání?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "č."
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Podmínka"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "když jsem "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, fuzzy, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7059,19 +7132,19 @@ msgstr ""
 "\n"
 "Krátký Autentizační řetězec pro toto sezení je: %(sas)s"
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Už jste prověřoval identitu tohoto kontaktu."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu ověřena"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Ověřit znovu"
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7081,19 +7154,19 @@ msgstr ""
 "zprávy nebo vám poslat zprávu, je potřeba ověřit jejich identitu kliknutí na "
 "tlačítko dole."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NENÍ ověřena"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Ověřit..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Ověřil(a) jste identitu kontaktu?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, fuzzy, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7107,21 +7180,21 @@ msgstr ""
 "Autentizační řetězec (SAS) jako vy.\n"
 "Krátký Autentizační řetězec: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Mluvily jste se vzdáleným kontaktem a ověřil s ním SAS?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "Klíč kontaktu (%s) <b>se neshoduje</b> s klíčem přiřazeným v Gajimu."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Tomuto kontaktu není přiřazen GPG klíč. Proto nemůžete šifrovat zprávy."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7130,7 +7203,7 @@ msgstr ""
 "proto zpráva <b>nemůže</b> být zašifrovaná. Použijte Váš GPG klient pro "
 "nastavení důvěry."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7225,20 +7298,20 @@ msgstr "Popis"
 msgid "Id"
 msgstr "č."
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Diskuze \"%s\" už je ve Vašich záložkách."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Můžete spravovat Vaše záložky přes menu Akce ve vašem Seznamu."
 
@@ -7250,15 +7323,15 @@ msgstr "Autorizován"
 msgid "Node"
 msgstr "Uzel"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Nový záznam"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
@@ -7704,33 +7777,33 @@ msgstr "Gajim vyžaduje k běhu X server. Končím..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim vyžaduje PyGTK 2.8 nebo novější"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim vyžaduje PyGTK 2.8 nebo novější. Končím..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim potřebuje GTK 2.8 nebo novější"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim vyžaduje GTK 2.8 nebo novější. Končím..."
 
 # FIXME: runtime je jak?
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime vyžaduje podporu libglade"
 
 # FIXME: runtime?
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7739,21 +7812,21 @@ msgstr ""
 "Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní "
 "verzi z %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Ujistěte se prosím, že GTK+ a PyGTK ve Vašem systému podporují libglade."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vyžaduje PySQLite2"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim potřebuje k běhu pywin32"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7763,11 +7836,11 @@ msgstr ""
 "získat na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim již běží"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7775,35 +7848,35 @@ msgstr ""
 "Jiná instance Gajimu pravděpodobně již běží\n"
 "Přesto spustit?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Zadej heslo GPG klíče pro účet %(keyid)s (účet %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Nepřiřazen GPG klíč"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7814,59 +7887,59 @@ msgstr ""
 "zaregistrována někým jiným.\n"
 "Níže vyber jinou přezdívku:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Chcete přijmout tuto žádost na účtě %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba při odesílání %s ( %s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Žádost o autorizaci"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7874,77 +7947,77 @@ msgstr ""
 "Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
 "Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Zrušit autorizaci"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s se přejmenoval na %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je nyní %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s nastavil předmět na %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Každý návštěvník uvidí váš úplný JID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Místnost nyní zobrazuje nedostupné členy"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "místnost nyní nezobrazuje nedostupné členy"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Nastala změna nastavení netýkající se soukromí"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Zaznamenávání historie je zapnuto"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávání historie je vypnuto"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Místnost není anonymní"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Místnost je částečně anonymní"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Místnost je plně anonymní"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Pro připojení do místnosti %s je vyžadováno heslo. Zadejte"
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7952,20 +8025,25 @@ msgstr ""
 "Nastavily jste Gajim aby používal GPG agenta, ale žádný GPG agent není "
 "spuštěný nebo vrátil chybné heslo.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Vaše heslo je neplatné"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG je nepoužitelné"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7973,13 +8051,14 @@ msgid ""
 msgstr ""
 "Tomuto kontaktu není přiřazen GPG klíč. Proto nemůžete šifrovat zprávy."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7988,12 +8067,12 @@ msgstr ""
 "Gnome Keyring je nainstalován ale není správně spuštěn (proměná prostředí "
 "není asi správně nastavena)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový E-mail pro %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8001,7 +8080,7 @@ msgstr[0] "Máte %d nepřečtený E-mail"
 msgstr[1] "Máte %d nepřečtené E-maily"
 msgstr[2] "Máte %d nepřečtených E-mailů"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8016,44 +8095,44 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Soubor %(filename)s od %(name)s byl úspěsně přijat."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8062,46 +8141,46 @@ msgstr ""
 "Nepodařilo se dešifrovat zprávu od %s\n"
 "Možná je falešná."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Nepodařilo se dešifrovat zprávu"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Konflikt uživatelských jmen"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Chyba."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Konflikt Zdrojů"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Už jsi připojen(a) k tomuto účtu se stejným zdrojem. Prosím zadej nový"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Chyba ověřování SSL certifikátu"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8111,15 +8190,15 @@ msgstr ""
 "Chyba při ověřování SSL vertifikátu na vašem jabber serveru: %(error)s\n"
 "Chcete se přesto připojit?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovat tuto chybu certifikátu."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8136,11 +8215,11 @@ msgstr ""
 "\n"
 "Chcete se stále připojit a aktualizovat otisk certifikátu?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Nezabezpečené Spojení"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8148,11 +8227,11 @@ msgstr ""
 "Chystáte se poslat vaše heslo nezabezpečeným spojením. Jste si jistý(á), že "
 "to skutečně chcete udělat?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ano, chci se připojit nezabezpečeně"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8160,21 +8239,21 @@ msgstr ""
 "Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
 "PyOpenSSL. Jste si jisti, že to chcete udělat?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "PEP uzel nebyl smazán"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP uzel %(node)s se nepodařilo odstranit: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8182,7 +8261,7 @@ msgstr ""
 "Vámi nastavené téma pro smajlíky nebylo nalezeno, proto budou smajlíci "
 "vypnuty "
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8192,14 +8271,14 @@ msgstr ""
 "aktualizovat formát v souboru emoticons.py. Viz.: http://trac.gajim.org/wiki/"
 "Emoticons "
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
 # FIXME: jaky je rozdil mezi settings a preferences? - kdo vi :)
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
@@ -8233,12 +8312,13 @@ msgstr ""
 "samostatném řádku"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "účet"
 
@@ -8264,9 +8344,9 @@ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "zpráva"
 
@@ -8283,22 +8363,46 @@ msgstr ""
 "účtů které mají povolenu volbu \"sync with global status\" "
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Změní stav účtu nebo účtů"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_ta:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Chtěl(a) bych za_registrovat nový účet"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech "
+"účtů které mají povolenu volbu \"sync with global status\" "
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Zobrazte okno rozhovoru, aby jste mohl(a) poslat zprávu kontaktu"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, se kterým chcete komunikovat"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "pokud uvedeno, kontakt bude vzít ze seznamu kontaktů pro tento účet"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8308,29 +8412,29 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "Tělo zprávy"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp klíč"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "pokud bude uvedeno, zpráva bude zašifrována tímto veřejným klíčem"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8340,135 +8444,135 @@ msgstr ""
 "jsou volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', "
 "nastavte prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "předmět"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "předmět zprávy"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Poslat novou zprávu do diskuze ke které jste připojeni."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID diskuze do které přijde zpráva"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Získej detailní informace o kontaktu"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Získej detailní informace o účtu"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Jméno účtu"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Pošle soubor kontaktu"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "soubor"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Vypíše všechna nastavení a jejich hodnoty"
 
 # FIXME: opravit, pokud je mozne prekladat i key & value
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaví hodnotu klíče 'key' na hodnotu 'value'"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "klíč=hodnota"
 
 # FIXME: opet
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klíč' je jméno volby, 'hodnota' je hodnota která se nastavuje"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Smaže položku nastavení"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "klíč"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "jméno volby, která bude smazána"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuální nastavení do souboru .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Přidat kontakt do Seznamu"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Přidá nový kontakt do tohoto účtu"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vrátí aktuální stav (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vrací aktuální popis stavu (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Vrací počet nepřečtených zpráv"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otevře dialog 'Začít rozhovor'"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Začít rozhovor z tohoto účtu"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Poslat vlastní XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML k odeslání"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8476,72 +8580,72 @@ msgstr ""
 "Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání "
 "ze všech účtů"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Obsluhovat xmpp:/ uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI k obsluze"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Účet s kterým chcete manipulovat"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "Tělo zprávy"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "_Vstoupit do místnosti MUC"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "místnost"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "JID Místnosti"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "přezdívka"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Přezdívka kterou chete použít"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "heslo"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Heslo pro vstup do místnosti"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Účet z kterého chcete vstoupit do místnosti"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Zkontrolujte, zda Gajim již běží."
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Zobrazí nebo skryje okno ipythonu"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8550,15 +8654,15 @@ msgstr ""
 "'%s' není ve vašem Seznamu.\n"
 "Prosím uveďte účet, přes který bude odeslána zpráva."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Vypadá to, že Gajim neběží. Proto nemůžete použít gajim-remote"
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8567,16 +8671,16 @@ msgstr ""
 "Použití: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8585,7 +8689,7 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8594,7 +8698,7 @@ msgstr ""
 "Příliš mnoho parametrů. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8603,7 +8707,7 @@ msgstr ""
 "Parametr \"%(arg)s\" nebyl uveden. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Nesprávné uri"
 
@@ -8632,286 +8736,150 @@ msgstr "Nemůžete smazat právě používané téma"
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Už nejsi v místnosti \"%(room)s\" nebo \"%(nick)s\" odešel(a)."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Rozhovor s"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Pokračování v rozhovoru"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Zaznamenávání historie je povoleno"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Nová místnost byla vytvořena"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Server přidělil nebo změnil název vaší místnosti"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
 
 # FIXME: preklad pro ban? zabanovani je hnusne
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s byl zakázán od %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "Příslušnost:"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "nastavení místnosti se změnilo na vstup pouze členům"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "vypnout systém"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(actor)s nastavil(a) vztah %(nick)s na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Vztah %(nick)s byl nastaven na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(actor)s nastavil(a) postavení %(nick)s na %(role)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Postavení %(nick)s bylo nastaveno na %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Přezdívka nenalezena: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Místnost nemá žádné téma"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Přezdívka nenalezena: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Použití: /%s <přezdívka|JID> [důvod], zakáže JID přístup do místnosti. "
-"Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je JID "
-"právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
-"nájemníkovi."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, pokud "
-"byl uveden."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s uvedeným "
-"důvodem."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti "
-"místnost@server, případně s uvedenou přezdívkou."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou z "
-"místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Použití: /%s <přezdívka> [zpráva], otevře okno se soukromou zprávou a odešle "
-"zprávu nájemníkovi určeném přezdívkou."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Použití: /%s , zobrazí jména nájemníků v místnosti."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Použití: /%s <zpráva>, odešle zprávu bez hledání jiných příkazů."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Pokud zavřete toto okno, budete odpojen(a) z této místnosti."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Likviduji: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8919,22 +8887,22 @@ msgstr ""
 "Místnost bude s konečnou platností zničena.\n"
 "Můžete specifikovat důvod zničení:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Také můžete specifikovat náhradní místo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -9006,6 +8974,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Uložit obrázek jako..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Nová diskuze"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Rád bych si Vás přidal(a) do svého seznamu"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
@@ -9088,52 +9064,62 @@ msgstr "Historie rozhovorů s %s"
 msgid "Disk Error"
 msgstr "Chyba disku"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Chybová zpráva: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Chyba."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je nyní %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Obrázek je příliš veliký"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Vážně chcete smazat vybranou zprávu?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Diskuze"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Zprávy"
 
@@ -9193,18 +9179,18 @@ msgstr "Ignorovat"
 msgid "Retrieving profile..."
 msgstr "Stahuji profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Soubor je prázdný"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Soubor neexistuje"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
@@ -9235,46 +9221,46 @@ msgid ""
 msgstr ""
 "Nastala chyba při publikování Vašich osobních údajů, zkuste to později znovu."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš stav."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Pokud \"%s\" povolí Vaši žádost o autorizaci, budete vidět jeho stav."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nyní Vás \"%s\" uvidí vždy jako odpojeného."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelné"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9283,28 +9269,28 @@ msgstr ""
 "si jistý(á), že se chcete stát neviditelným(ou)?"
 
 # FIXME: mozna nejak lepe? :/
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "nesynchronizováno"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9312,16 +9298,16 @@ msgstr ""
 "Zprávy bude možné číst později, pokud máte povolený záznam historie a "
 "kontakt je v rosteru."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Musíš si je přečíst před smazáním transportu."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9329,11 +9315,11 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transport bude smazán"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9342,57 +9328,68 @@ msgstr ""
 "Už více nebudete moci posílat ani přijímat zprávy od kontaktů z těchto "
 "transportů:%s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Chystáte se vytvořit metacontact. Určitě chcete pokračovat?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Přejmenovat kontakt"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chceš smazat skupinu %s z rosteru?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Odstranit také všechny kontakty v této skupině z Vašeho rosteru"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude smazán z Vašeho rosteru"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Chystáte se smazat \"%(name)s\" (%(jid)s) z vašeho rosteru.\n"
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9401,11 +9398,11 @@ msgstr ""
 "odpojeného."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9413,16 +9410,16 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Chci aby tento kontakt věděl o mém stavu i po odstranění"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty budou smazány z Vašeho rosteru"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9431,20 +9428,33 @@ msgstr ""
 "Smazáním těchto kontaktů:%s\n"
 "také zrušíte autorizaci. Kontakty Vás tak vždy uvidí jako odpojeného."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Chystáte se vytvořit metacontact. Určitě chcete pokračovat?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9452,12 +9462,12 @@ msgstr ""
 "Tvůj server nepodporuje ukládání metakontaktů. Tyto informace nebudou při "
 "přístím připojení uloženy."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chystáte se vytvořit metacontact. Určitě chcete pokračovat?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9467,11 +9477,11 @@ msgstr ""
 "jsou užitečné, když jeden člověk má víc účtů v síti Jabber nebo účty v "
 "transportech."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Neplatná cesta k souboru:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9479,12 +9489,12 @@ msgstr[0] "Chcete poslat %s tento soubor:"
 msgstr[1] "Chcete poslat %s tyto soubory:"
 msgstr[2] "Chcete poslat %s tyto soubory:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Odeslat %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Pošle soubor kontaktu"
@@ -9494,116 +9504,128 @@ msgstr "Pošle soubor kontaktu"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Spravovat _záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "_Zveřejnit hudbu"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "_Nastavit služby..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maximalizovat Vše"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Rád bych si Vás přidal(a) do svého seznamu"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Spravovat kontakty"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Upravit _skupiny"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Provést příkaz..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "Transporty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Upravit transport"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Přejmenovat"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maximalizovat"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Odpojit"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Nová diskuze"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Odpojit"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Připojit se do diskuze"
 
 # FIXME: nejak divne, asi spatne prelozene -ne myslim ze to je ok
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
@@ -9621,20 +9643,20 @@ msgstr "Chyba v příchozím datagramu"
 msgid "No result"
 msgstr "Žádný výsledek"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Chyba zápisu na disk"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Předmět: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Potvrdit volby pro toto sezení"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9649,7 +9671,7 @@ msgstr ""
 "\n"
 "\t\tJsou tyto volby přijatelné?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9837,6 +9859,131 @@ msgstr "Není zde žádný nevyřízený požadavek."
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Přidat zvláštní _upozornění"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Přiřadit Open_PGP klíč"
+
+# FIXME: co je zeroconf?
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Příkaz není podporován pro zeroconf účet."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Příkazy: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Použití: /%s, smaže zprávy v okně."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Použití: /%s, skryje tlačítka rozhovoru."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Použití: /%(command)s <akce>, pošle akci do aktuální místnosti. Použijte "
+#~ "třetí osobu (například /%(command)s explodoval.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Použití: /%s, pošle ping kontaktu"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Použití: /%s, pošle zprávu kontaktu"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Žádná další nápověda pro /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Povolit lokální zprávy typu zeroconf"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Přezdívka nenalezena: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Místnost nemá žádné téma"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Přezdívka nenalezena: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Použití: /%s <přezdívka|JID> [důvod], zakáže JID přístup do místnosti. "
+#~ "Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je "
+#~ "JID právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
+#~ "nájemníkovi."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, "
+#~ "pokud byl uveden."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s "
+#~ "uvedeným důvodem."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti "
+#~ "místnost@server, případně s uvedenou přezdívkou."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou "
+#~ "z místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Použití: /%s <přezdívka> [zpráva], otevře okno se soukromou zprávou a "
+#~ "odešle zprávu nájemníkovi určeném přezdívkou."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Použití: /%s , zobrazí jména nájemníků v místnosti."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr "Použití: /%s <zpráva>, odešle zprávu bez hledání jiných příkazů."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
+
 #~ msgid "B_OSH Port:"
 #~ msgstr "B_OSH Port:"
 
diff --git a/po/da.po b/po/da.po
index 3a7ffdd4d..c23efeb0a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:45+0200\n"
 "Last-Translator: Niels Felsted Thorsen <felsted@fsfe.org>\n"
 "Language-Team:  <>\n"
@@ -213,6 +213,7 @@ msgstr "<b>Personlig Information</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Konto"
 
@@ -280,8 +281,8 @@ msgstr "Redigere Personlig Information..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -292,8 +293,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "General"
 
@@ -353,25 +354,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Information om dig, som er gemt på serveren"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Ingen nøgle er valgt"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ingen"
 
@@ -529,8 +526,8 @@ msgstr ""
 "Du bør også ændre opsætning tilsvarende på en evt. brandmur."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -544,7 +541,7 @@ msgid "Mer_ge accounts"
 msgstr "Fle_t kontoer"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Om_døb"
 
@@ -806,7 +803,7 @@ msgid "All statuses"
 msgstr "Status For Alle"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Borte"
 
@@ -823,7 +820,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -832,7 +829,7 @@ msgid "Launch a command"
 msgstr "Kør en kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Ikke Tilgængelig"
 
@@ -1018,7 +1015,7 @@ msgid "Join _Group Chat"
 msgstr "Bliv med i en _Gruppe Samtale"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Tilføj til Kontaktliste..."
 
@@ -1044,39 +1041,6 @@ msgstr "_Åbn Henvisning i Netlæser"
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Inviter _Kontakter"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Send _Fil"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Slå til/fra ende til ende Kryptering"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Slå til/fra Open_PGP Kryptering"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Tilføj til Kontaktliste"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Historie"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "In_viter"
@@ -1101,6 +1065,119 @@ msgstr ""
 "Du er ved at begynde en Multibruger samtale.\n"
 "Vælg de kontakter du vil invitere"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "_Spørg om at kunne se hans/hendes status"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Tilføj Speciel Påmi_ndelse..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Tilskriv Open_PGP Nøgle..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Kør Kommando..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Ændre _Grupper..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "In_viter til"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Inviter _Kontakter"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "_Fjern"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Send _Tilpasset Status"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Send en Enkel _Besked"
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Send _Fil..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Angiv Personlig _Avatar..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Start _samtale"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Slå til/fra ende til ende Kryptering"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Slå til/fra Open_PGP Kryptering"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "Till_ad ham/hende at se min status"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Bloker"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Nægt ham/hende at se min status"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Historie"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignorer"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Håndter Kontakt"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Omdøb..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Abonnement"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Fjern blokering"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "Ikke ign_orer"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Udfyld formen."
@@ -1217,7 +1294,7 @@ msgstr ""
 "Kontakt række\n"
 "Samtale Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Fed"
 
@@ -1241,7 +1318,7 @@ msgstr "Borte"
 msgid "Inactive"
 msgstr "Ikke aktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1313,6 +1390,14 @@ msgstr "Or_dstyrer"
 msgid "Occupant Actions"
 msgstr "Beboer Handlinger"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Send _Fil"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Tilføj til Kontaktliste"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administrator"
@@ -1321,13 +1406,6 @@ msgstr "_Administrator"
 msgid "_Ban"
 msgstr "_Udvis"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Bloker"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Kast ud"
@@ -1344,13 +1422,6 @@ msgstr "_Ejer"
 msgid "_Send Private Message"
 msgstr "_Send en Privat Besked"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Fjern blokering"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Stemme"
@@ -1359,7 +1430,7 @@ msgstr "_Stemme"
 msgid "Create new post"
 msgstr "Lav en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Fra"
 
@@ -1384,8 +1455,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Loghistorie Håndterer</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Slet"
 
@@ -1438,34 +1509,39 @@ msgstr "Søg:"
 msgid "_Log conversation history"
 msgstr "_Log samtale historie"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Bogmærk dette rom (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Bliv med i en Gruppe Samtale"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Bliv med i dette rum automatisk når jeg tilsutter"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Kælenavn:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "For nylig:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Bliv med:"
@@ -1494,7 +1570,7 @@ msgstr "Minimer ved Automatisk Deltagelse"
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2027,7 +2103,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter efter status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2194,34 +2270,39 @@ msgid "All"
 msgstr "Alle"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "Alle efter abonnering"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Tillad"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Nægt"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Bestil:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Privatlivs Liste"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "Alle efter abonnering"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "Alle i gruppen"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2233,19 +2314,19 @@ msgstr ""
 "fra\n"
 "til"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "at sende mig beskeder"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "at sende mig forespørgsler"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "at sende mig status"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "at se min status"
 
@@ -2413,96 +2494,11 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Kan fjernes"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "_Spørg om at kunne se hans/hendes status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Tilføj Speciel Påmi_ndelse..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Tilskriv Open_PGP Nøgle..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Ændre _Grupper..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Kør Kommando..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "In_viter til"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "_Fjern"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Send _Tilpasset Status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Send en Enkel _Besked"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Send _Fil..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Angiv Personlig _Avatar..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Start _samtale"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "Till_ad ham/hende at se min status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Nægt ham/hende at se min status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignorer"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Håndter Kontakt"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Omdøb..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Abonnement"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "Ikke ign_orer"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2624,7 +2620,7 @@ msgid "_Add contact"
 msgstr "Tilføj Kont_akt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Information"
 
@@ -2841,26 +2837,6 @@ msgstr "_Besked"
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Tilføj Speciel _Påmindelse"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Tilskriv Open_PGP Nøgle"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Ændre _Grupper"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Omdøb"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Ændre Konto"
@@ -2905,48 +2881,48 @@ msgid "Service returned an error."
 msgstr "Tjeneste returnerede en fejl."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Aktiveret"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Ikke aktiveret"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Heltal"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Farve"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Værdi"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Skjult"
 
@@ -2960,189 +2936,188 @@ msgstr "Du har modtaget en ny hændelse:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretonsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Græsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Britisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norsk (bokmål)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Hollandsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Kinesisk"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Sprog for stavekontrollen"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "En tilslutning er ikke tilgængelig"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Din besked kan ikke blive sendt før du er tilsluttet."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Uforklaret"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Syg"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontakt Information"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Virkelig send denne fil?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Hvis du sender en fil til %s, vil han eller hun få at vide dit rigtige "
 "Jabber ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering aktiveret"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Ikke i Kontaktvinduet"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "En liste over aktive, færdige og stoppede filoverførsler"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Ukendt Artist"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Ukendt Titel"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Ukendt Kilde"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3151,17 +3126,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> af <i>%(artist)s</i>\n"
 "fra <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøgle valgt"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3169,50 +3144,50 @@ msgstr ""
 "Ingen GPG nøgle er valgt for denne kontakt. Derfor kan du ikke kryptere "
 "beskeder med GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Session VIL blive logget"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Session VIL IKKE blive logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "og godkendt"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "og IKKE godkendt"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3221,66 +3196,23 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale session %(logged)s blive logget."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Kommando er ikke understøttet for zeroconf konto."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Kommandoer: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Brug: /%s, rydder tekst vinduet"
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Brug: /%s, gem samtale knapper"
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Brug: /%(command)s <handling>, sender handling til den nuværende gruppe "
-"samtale. Brug tredie person. (f.eks. /%(command)s eksploderer.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Brug: %s, sender en ping til kontakten"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Brug: /%s, send beskeden til kontakten"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Ingen hjælp for /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Session forhandling annulleret"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Denne session er krypteret"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " og VIL blive logget"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " og VIL IKKE blive logget"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3288,25 +3220,25 @@ msgstr ""
 "Kontaktens identitet er ikke verificeret Tryk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende besked var IKKE krypteret"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Den følgende besked var krypteret"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du har netop modtaget en besked fra \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3314,15 +3246,15 @@ msgstr ""
 "Hvis du lukker dette faneblad og ikke har aktiveret historie loggen, vil du\n"
 "miste denne besked."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Database Fejl"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3331,7 +3263,7 @@ msgstr ""
 "Database filen (%s) kan ikke læses. Prøv at reparere den eller fjerne den "
 "(hele historikken vil tabes)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nu %(status)s"
@@ -3340,23 +3272,23 @@ msgstr "%(name)s er nu %(status)s"
 msgid "creating logs database"
 msgstr "opretter log database"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s er en fil, men burde være et katalog"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim vil nu slutte"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er et katalog men burde være en fil"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "opretter %s katalog"
@@ -3420,9 +3352,9 @@ msgstr "Vælg de gruppesamtaler du vil forlade"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
@@ -3438,55 +3370,100 @@ msgstr "Videresend ulæste beskeder"
 msgid "All unread messages have been forwarded."
 msgstr "Alle ulæste beskeder er blevet videresendt."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 "Brug D-Bus og Påmindelses-dæmonen (Notification-Daemon) til at vise "
 "påmindelser"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før din status ændres til borte."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Væk som et resultat af at være inaktiv i mere end $T minutter)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S vil blive ombyttet med den nuværende status besked, $T ved automatisk væk "
 "tid."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før din status ændres til ikke tilgængelig."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr ""
 "$S (Ikke tilgængelig som et resultat af at være inaktiv i mere end $T "
 "minutter)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S vil blive erstattet med den nuværende status besked, $T ved ikke "
 "tilgængelig tid."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Ugyldigt kælenavn"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "status besked tekst"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Ugyldigt kælenavn"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Ændre kælenavn"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "status besked tekst"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3494,21 +3471,17 @@ msgstr ""
 "kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "standard"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Aktiver link-local/zeroconf beskeder"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Sprog brugt af stavelseskontrollen"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3518,7 +3491,7 @@ msgstr ""
 "'nogen ganger' - skriv tid for hver print_ichat_every_foo_minutes minutter.\n"
 "'aldrig' - skriv aldrig tiden."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3529,18 +3502,18 @@ msgstr ""
 "upræcise klokke. 1 er den mest præcise klokke, 4 den mindst præcise. Dette "
 "bruges kun hvis print_time er 'nogen ganger'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings tegn."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Hvis sandt, ikke fjern */_. Således at *abc* bliver skrevet med fed skrift "
 "men * * bliver ikke fjernet."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3550,7 +3523,7 @@ msgstr ""
 "formatering hvis valgt. For syntaks, se http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html (Hvis du vil bruge dette, installer docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3558,7 +3531,7 @@ msgstr ""
 "Tegn som tilføjes efter kælenavn når der bruges kælenavnsfuldførelse (tab) i "
 "en gruppesamtale."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3566,7 +3539,7 @@ msgstr ""
 "Tegnforslag til at tilføje efter det ønskede kælenavn, når det ønskede "
 "kælenavn er i brug af en anden i gruppesamtalen."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3577,19 +3550,19 @@ msgstr ""
 "[timer:minutter]. Se python dokumentationen for strftime: http://docs.python."
 "org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tegn som bliver skrevet før kælenavnet i samtaler"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tegn som bliver skrevet efter kælenavnet i samtaler"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Tilføj * og [n] i tittelen på kontaktvinduet?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3597,11 +3570,25 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindue/"
 "faneblad genåbnes."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Hvor mange minutter skal sidste linjer fra forrige samtale vare."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3609,11 +3596,11 @@ msgstr ""
 "Send besked med Ctrl+Enter og lave en ny linie med Enter (standard Mirabilis "
 "ICQ klient adfærd)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal gemmes for Ctrl+KeyUP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3622,12 +3609,12 @@ msgstr ""
 "Enten en tilpasset url som indeholder %s hvor %s er ordet/frasen, eller "
 "'WIKTIONARY' som betyder brug wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Hvis valgt kan Gajim blive kontrolleret eksternt ved hjælp af gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3639,14 +3626,14 @@ msgstr ""
 "de synkroniserer med global status) baseret på status af "
 "netværksforbindelsen."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
 "disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3654,7 +3641,7 @@ msgstr ""
 "Vis samtale status påmindelser i samtale vinduer. Kan være en af disse: all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3662,11 +3649,11 @@ msgstr ""
 "Når der ikke skrives tid for hver besked (print_time==sometimes), skriv "
 "tiden for hver x minutter."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spørg før et gruppesamtale vindue/faneblad lukkes."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3674,7 +3661,7 @@ msgstr ""
 "Altid spørg før et gruppesamtale vindue/faneblad lukkes, hvis den findes i "
 "denne mellemrums separerede liste af gruppesamtale jids."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3682,13 +3669,13 @@ msgstr ""
 "Aldrig spørg før et gruppesamtale vindue/faneblad lukkes, hvis den findes i "
 "denne mellemrums separerede liste af gruppesamtale jids."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3697,27 +3684,27 @@ msgstr ""
 "grænseflader, for filoverførsler i tilfælde af adresse omskrivning/port "
 "videresending."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard siger KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Vis påmindelse af hændelser i statusfelt ikonet."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Vis et faneblad når der kun er en samtale?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis faneblade i samtalevinduer?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Vis lukke knap i faneblad?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3729,17 +3716,17 @@ msgstr ""
 "16, 17 og 18. Højere tal er mere sikre, men tager længere tid at udregne når "
 "du starter en session."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvis nye beskeder i et påmindelses pop op vinduer?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "En semikolon-separeret liste af ord som vil blive fremhævet i gruppesamtaler."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3747,14 +3734,14 @@ msgstr ""
 "Hvis Sandt, lukker Gajim når X knappen fra vindueshåndteringen klikkes. "
 "Denne indstilling tages der kun hensyn til hvis et statusfelt ikon bruges."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Hvis Sandt, vil Gajim kontrollere om den er standard jabber klient ved hver "
 "opstart."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3762,7 +3749,7 @@ msgstr ""
 "Hvis Sandt, vil Gajim vise et ikon på hvert faneblad som indeholder ulæste "
 "beskeder. Afhængig af temaet, kan dette ikon være animeret."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3770,12 +3757,12 @@ msgstr ""
 "Hvis Sandt, vil Gajim vise status beskeder, hvis ikke tomme, for hver "
 "kontakt under kontaktnavnet i kontaktvinduet."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definer positionen af avataren i kontaktvinduet. Kan være venstre eller højre"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3783,7 +3770,7 @@ msgstr ""
 "Hvis Sandt, vil Gajim spørge for en avatar for hver kontakt som ikke havde "
 "en avatar sidste gang eller har en gemt som er for gammel."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3792,7 +3779,7 @@ msgstr ""
 "kontakt ændrer hans eller hendes status og/eller hans eller hendes status "
 "besked."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3806,30 +3793,30 @@ msgstr ""
 "vil Gajim skrive alle status beskeder. Hvis \"in_and_out\" vil Gajim kun "
 "skrive FOO kommer/forlader gruppesamtalen."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Baggrundsfarve på kontakter når de netop har tilsluttet sig."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Baggrundsfarve på kontakter når de netop har afbrudt tilslutningen."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Hvis Sandt vil gamle beskeder fra forrige samtale bruge en mindre skrifttype "
 "end den som er standard."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis en avatar for selve transporten."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke hvis kontaktvindue i vindueslisten."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3839,7 +3826,7 @@ msgstr ""
 "vinduet (standard adfærd i de fleste vindueshåndterere) når det indeholder "
 "ventende begivenheder."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3850,7 +3837,7 @@ msgstr ""
 "sha information i gruppesamtaler."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3871,31 +3858,31 @@ msgstr ""
 "'pertype' - Hver besked type (for eks. samtaler versus gruppesamtaler) "
 "bliver sendt til et specifikt vindue."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Hvis Falsk vil du ikke længere se en avatar i samtale vinduet."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Hvis Sandt vil tryk på escape tasten lukke et vindue/faneblad."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Skjuler knapperne i samtale vinduer."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Skjuler banneret i et gruppesamtale vindue"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Skjuler banneret i et to personers samtalevindue"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skjuler gruppesamtale deltagerlisten i gruppesamtale vinduer."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3903,15 +3890,15 @@ msgstr ""
 "I en samtale, vis kælenavn i begyndelsen af en linie kun når det ikke er den "
 "samme person som snakker som i forrige besked."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indrykning når man fletter ens kælenavne."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Udglattet rulning af beskeder i samtale vinduet"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3919,11 +3906,11 @@ msgstr ""
 "Liste af farver, separeret med \":\", som vil blive brugt til at farve "
 "kælenavne i gruppesamtaler."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab gå til næste faneblad når ingen er ulæste."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3931,7 +3918,25 @@ msgstr ""
 "Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
 "streng betyder at vi aldrig viser vinduet."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
+"streng betyder at vi aldrig viser vinduet."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
+"streng betyder at vi aldrig viser vinduet."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3941,7 +3946,7 @@ msgstr ""
 "konto i kontoændrings vinduet. VÆR FORSIGTIG, når du er logget med en "
 "negativ prioritet vil du IKKE modtage nogen beskeder fra din server."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3949,7 +3954,7 @@ msgstr ""
 "Hvis Sandt vil Gajim bruge Gnome Nøglering (hvis tilgængelig) til at gemme "
 "konto adgangskoder."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3958,7 +3963,7 @@ msgstr ""
 "Hvis Sandt vil Gajim bruge Gnome Nøglering (hvis tilgængelig) til at gemme "
 "konto adgangskoder."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3966,7 +3971,7 @@ msgstr ""
 "Hvis Sandt vil Gajim vise antallet af online og totale kontakter i konto og "
 "gruppe rækker."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3974,7 +3979,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Hvis ikke tom, behandl alle indkommende "
 "beskeder som om de var af denne type"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3982,7 +3987,7 @@ msgstr ""
 "Hvis Sandt vil Gajim rulle ned/op og vælge den kontakt som sendte dig den "
 "sidste besked, hvis ikke allerede kontaktvinduet er åbent."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3990,12 +3995,12 @@ msgstr ""
 "Hvis Sandt vil Gajim omdanne strengen mellem $$ og $$ til et billede med "
 "dvips og omdanne det inden det bliver sat ind i et samtale vindue."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Tid med inaktivitet der skal gå før vinduet til at ændre status lukkes."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4003,7 +4008,7 @@ msgstr ""
 "Maksimum antal linjer som bliver skrevet i samtaler. De ældste linjer bliver "
 "slettet."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4011,11 +4016,11 @@ msgstr ""
 "Hvis sandt vil påmindelses vinduer fra påmindelses dæmonen blive fæstet til "
 "ikonet i systembakken."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Vælg interval mellem 2 kontroller for ingen aktivitet."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4023,7 +4028,7 @@ msgstr ""
 "Du kan ændre værdien for at ændre størrelsen af latex formler som bliver "
 "vist. Jo højere jo større."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4032,13 +4037,23 @@ msgstr ""
 "Gyldige uri skemaer. Kun skemaer i denne liste vil blive accepteret som "
 "\"rigtige\" uri."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4046,7 +4061,7 @@ msgstr ""
 "Prioriteten vil ændres automatisk ifølge din status. Prioriteter er "
 "defineret i autopriority_* indstillingerne."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4055,26 +4070,37 @@ msgstr ""
 "væk, ikke tilgængelig, vil ikke forstyrres, usynlig. NOTE: denne "
 "valgmulighed bliver kun brugt hvis restore_last_status er deaktiveret"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Hvis valgt, gendan den sidste status som var brugt."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Hvis Falsk vil du ikke længere se en avatar i samtale vinduet."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Hvis deaktiveret, ikke signer tilstedeværelser med GPG nøgle, selvom GPG er "
 "konfigureret."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne konto."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en krypteret session når det er muligt?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4082,30 +4108,30 @@ msgstr ""
 "En ordnet liste (adskilt af mellemrum) af forbindelses typer som skal "
 "prøves. Kan indeholde tls, ssl eller plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
 "klar tekst."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Hvis en advarsels dialog før brugen af standard SSL biblioteket."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellemrums adskilt liste af ssl fejl som skal ignoreres."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4115,11 +4141,11 @@ msgstr ""
 "prøver at forbinde igen."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 tilpasning"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4127,15 +4153,15 @@ msgstr ""
 "Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
 "indstillingen for filoverførsler."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Svar til modtagelses forespørgsel"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Sendte modtagelses forespørgsler"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4143,11 +4169,11 @@ msgstr ""
 "Ved forhandling af en krypteret session, skal Gajim da antage at du vil have "
 "dine beskeder logget?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP aktiveret for denne kontakt?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4155,101 +4181,101 @@ msgstr ""
 "Skal Gajim automatisk starte en krypteret session med denne kontakt når det "
 "er muligt?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprog som vi vil bruge til at kontrollere for stavefejl"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "alt eller mellemrums separeret status"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nej', eller 'begge'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'ja', 'nej' eller ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Snart tilbage"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Tilbage om få minutter."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så læg en besked."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Jeg ser en film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Arbejder"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Jeg arbejder."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Jeg snakker i telefon."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Ude"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Jeg er ude og nyder livet."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Jeg er tilgængelig."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Jeg er tilgængelig for en samtale."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Er straks tilbage."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgængelig."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Ikke forstyr."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Farvel!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4258,99 +4284,99 @@ msgstr ""
 "muc_highlight_words, eller når en gruppesamtale besked indeholder dit "
 "kælenavn."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en hvilken som helst MUC besked ankommer."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "grøn"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "købmandsvarer"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "menneske"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marint"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Ikke i stand til at indlæse tomgangs modulet"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Forkert vært"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Invalid local address? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings information for transporten %s har ikke ankommet i tide"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Registrer til %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Tilslutning Fejlede"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Disk skrivefejl"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Usynlighed er ikke understøttet"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s understøtter ikke usynlighed."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Ugyldigt Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4359,77 +4385,84 @@ msgstr ""
 "Database filen (%s) kan ikke læses. Prøv at reparere den (se http://trac."
 "gajim.org/wiki/DatabaseBackup) eller fjerne den (hele historikken vil tabes)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kælenavn er ikke tilladt: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er bandlyst fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalen %s eksisterer ikke."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oprettelse er begrænset."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Dit registrerede kælenavn skal bruges i gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten for gruppesamtalen %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Rummet er blevet ødelagt"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan deltage i dette rum i stedet: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nu på %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "forespørsel om ophør på abonnement fra %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nu abonnerer vi ikke længere på %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4439,222 +4472,208 @@ msgstr ""
 "kontaktvindue. Brug kontaktvindue håndterings redskaber som http://jru."
 "jabberstudio.org/ til at fjerne det."
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP adgangskode blev ikke givet"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til at skaffer udstedelses certifikat"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til at skaffe certifikat CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til at dekryptere certifikatets signatur"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til at dekryptere CRL's signatur"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Ikke i stand til at dekode udstederens offentlige nøgle"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Certifikat signaturen fejlede"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "CRL signatur fejl"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL er endnu ikke gyldigt"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL er udløbet"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfejl i certifikatets notBefore felt"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfejl i certifikatets notAfter felt"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfejl i CRL's lastUpdate felt"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfejl i CRL's nextUpdate felt"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Ikke mere hukommelse"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Selvsigneret certifikat"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsigneret certifikat i certifikats kæden"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Ikke i stand til at skaffe lokalt udstedelses certifikat"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Ikke i stand til at verificere det første certifikat"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Certifikat kæde er for lang"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA certifikat"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Sti længde begrænsning overskredet"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Ikke understøttet formål for certifikatet"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Certifikatet er ikke til at stole på"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Certifikatet afvist"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Emne udsteder uoverensstemmelse"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og emne nøgle identifikations uoverensstemmelse"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og udstedelses serie nummer uoverensstemmelse"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Nøglebrug indeholder ikke certifikat signering"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Kunne ikke verificere programmet"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilslutning til konto \"%s\" er blevet afbrudt"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Tilslut manuelt."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Server %(name)s svarede forkert på indskrivnings forespørgslen: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serveren %s gav en anderledes registreringsform"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukendt SSL fejl: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Forkert svar"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s svarede forkert på indskrivnings forespørgslen: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke tilslutte til \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Kontroller din tilslutning eller forsøg igen senere."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Gemt i: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Tilslutning til proxy fejlede"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke tilslutte til kontoen %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "Tilslutning til kontoen \"%s\" er blevet afbrudt. Prøv at tilslutte igen."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Ægtheden af %s certifikatet kan være ugyldig."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4663,7 +4682,7 @@ msgstr ""
 "\n"
 "SSL Fejl: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4672,24 +4691,24 @@ msgstr ""
 "\n"
 "Ukendt SSL fejl: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Kontroller din tilslutning eller prøv igen senere"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Godkendelse fejlede med \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Venligst kontroller om dit logind og adgangskode er korrekt."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Fejl under fjernelse af privatlivs liste"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4698,31 +4717,31 @@ msgstr ""
 "Privatlivs liste %s er ikke blevet fjernet. Den er måske aktiv i en af dine "
 "tilsluttede ressourcer. Deaktivér den og prøv igen."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Det er ikke mulig at sende tomme filer"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 "Den fjerne tilstedeværelse er ikke signeret og en nøgle blev ikke angivet."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "Kontaktens nøgle (%s) passer ikke til den angivne nøgle i Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne besked er *krypteret* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4731,30 +4750,40 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Inviter _Kontakter"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grund af usynlig status"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Tilslutning Fejlede"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Iagttagere"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transporter"
 
@@ -4763,14 +4792,19 @@ msgid "Not in roster"
 msgstr "Ikke i kontaktvindue"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne computer"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-Bus evner kan ikke bruges"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
@@ -4847,56 +4881,69 @@ msgid "eleven"
 msgstr "elleve"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "klokken %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "fem over %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "ti over %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "kvart over %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "tyve over %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "femogtyve over %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, fuzzy, python-format
 msgid "half past %(0)s"
 msgstr "halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "femogtyve minutter i %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "tyve minutter i %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "kvart på %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "ti på %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "fem på %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "klokken %(1)s"
 
@@ -4964,224 +5011,224 @@ msgstr "Ugyldig karakter i værtsnavn."
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressource."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Travlt"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Travlt"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Ikke tilgængelig"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "Ti_lgængelig"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Tilgængelig"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "_Væk"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Afkoblet"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Afkoblet"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukendt"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har fejl"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Intet"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Intet"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Deltagere"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Deltager"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Ejer"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "er opmærksom på samtalen"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "gør noget andet"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "komponerer en besked..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "holder pause med at komponere en besked"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanebladet"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d besked venter"
 msgstr[1] "%d beskeder venter"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr "fra rum %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr "fra bruger %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " fra %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hændelse venter"
 msgstr[1] "%d hændelser venter"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Fejl under kørsel af \"%(command)s\": %(error)s"
@@ -5197,11 +5244,11 @@ msgstr "%s er ikke et gyldigt logniveau"
 msgid "error: cannot open %s for reading"
 msgstr "fejl: kan ikke åbne %s for læsning"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "flytter log databasen til flere indeks"
 
@@ -5853,7 +5900,7 @@ msgstr ""
 "annulleret."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5861,7 +5908,7 @@ msgstr ""
 "[Dette er en del af en krypteret session. Hvis du ser denne besked gik noget "
 "galt.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5870,17 +5917,29 @@ msgstr ""
 "Værten %s du konfigurerte i ft_add_hosts_to_send avancerte indstillinger er "
 "ikke gyldig, så den bliver ignoreret."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP adgangskode blev ikke givet"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "For at kunne fortsætte med at sende og modtage beskeder, må du tilslutte dig "
 "igen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahi fejl"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5889,31 +5948,31 @@ msgstr ""
 "%s\n"
 "Link-local beskeder vil sandsynligvis ikke virke ordentligt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontroller venligst om Avahi eller Bonjour er installeret."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ikke i stand til at tildele port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontroller venligst om avahi-dæmonen kører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke ændre status på kontoen \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5921,20 +5980,20 @@ msgstr ""
 "Du er ikke tilsluttet eller synlig for andre. Din besked kunne ikke sendes."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Denne besked er krypteret]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Din besked kunne ikke sendes."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt er afkoblet. Din besked kunne ikke sendes."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5947,24 +6006,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Fejl ved tilføjelse af tjeneste. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Ikke aktiveret"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Standard Besked"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbog for sproget %s er ikke tilgængelig"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5973,70 +6032,70 @@ msgstr ""
 "For at bruge stavekontrollen må du installer en %s ordbog, eller vælge et "
 "andet sprog ved indstillingen for sprog til stavekontrollen."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "status besked Titel"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "status besked tekst"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Log ind igen nu?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Hvis du vil at alle ændringerne skal træde i kraft nu, må du logge ind igen."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Det er ikke muligt at bruge OpenPGP på denne computer"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Ulæste hændelser"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Læs alle ventende hændelser før denne konto fjernes."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har en åben samtale med kontonavnet %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Alle samtale og gruppesamtale vinduer vil blive lukket. Vil du fortsætte?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Du er for øjeblikket tilsluttet til serveren"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "For at ændre kontonavnet må du afbryde din tilslutning"
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "For at ændre kontonavnet må du læse alle ventende hændelser."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Kontonavnet er allerede i brug"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6044,139 +6103,145 @@ msgstr ""
 "Dette navn er allerede brugt til en af dine andre kontoer. Vælg venligst et "
 "andet navn."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Ugyldigt kontonavn"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Kontonavnet kan ikke være tomt."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Kontonavnet kan ikke indeholde mellemrom."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Omdøb Konto"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Indtast et nyt navn for kontoen %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Et Jabber ID må være på formen \"bruger@servernavn\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Ugyldig indgang"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Personlig port må være et port nummer."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Forsøg på at hente krypteringsnøgler mislykkedes"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Der opstod et problem under forsøget på at hente dine OpenPGP nøgler."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøgle Valg"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Vælg din OpenPGP Nøgle"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Ingen konto ved det navn er tilgængelig"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Du må oprette en konto før du kan redigere din personlige information."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilsluttet til serveren"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Uden en tilslutning kan du ikke redigere din personlige information."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Din server understøtter ikke Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke gemme din personlige information."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "For at ændre kontonavnet må du afbryde din tilslutning"
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Den Lokale Konto eksisterer allerede."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Omdøb eller fjern den før du aktiverer link-local beskeder."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Liste over bandlyste"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Ejer Liste"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Kælenavne"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Bandlysning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6184,11 +6249,11 @@ msgstr ""
 "<b>Hvem vil du bandlyse?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Tilføj Medlem..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6196,11 +6261,11 @@ msgstr ""
 "<b>Hvem vil du gøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Tilføj Ejer..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6208,11 +6273,11 @@ msgstr ""
 "<b>Hvem vil du gøre til ejer?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Tilføj Administrator..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6220,7 +6285,7 @@ msgstr ""
 "<b>Hvem vil du gøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6237,125 +6302,124 @@ msgstr ""
 "4. domæne (domænet træffer, ligeledes et hvilken som helst bruger@domæne,\n"
 "domæne/resource, eller adresse indeholdende et subdomæne."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv din adgangskode for kontoen %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Gem adgangskode"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Hvis du fjerne den vil tilslutningen tabes."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Gå kun ind og ud"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Ny Gruppe Samtale"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Dette bogmærke er ugyldigt"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Fyld ud server og rum tekstindtastningsfelterne eller fjern dette bogmærke."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Ugyldigt kælenavn"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Kælenavn er ikke tilladt: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Ugyldigt server"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Ugyldig indgang"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Kontoen er blevet tilføjet med succes"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Du kan sætte avancerede konto indstillinger ved at trykke Avanceret knappen, "
 "eller senere ved at vælge kontoens menupunkt under Rediger menuen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto er blevet oprettet med succes"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Ugyldigt brugernavn"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Du må give et brugernavn for at konfigurere denne konto."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Anfør en server som du vil registrere dig ved."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Certifikatet er allerede i filen"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dette certifikat er allerede i filen %s, så det bliver ikke tilføjet igen."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6370,7 +6434,7 @@ msgstr ""
 "SSL Fejl: %(error)s\n"
 "Vil du stadig prøve at forbinde til denne server?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6381,63 +6445,63 @@ msgstr ""
 "Certifikatets SHA1 fingeraftryk:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Under oprettelsen af kontoen opstod der en fejl"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Kontonavnet er i brug"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Du har allered en konto med dette navn."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Hændelse"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Første Besked er Modtaget"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Næste Besked Modtages i Fokus"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Næste Besked Modtages uden Fokus"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakt er Tilsluttet"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakt er ikke Tilsluttet"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Besked er Sendt"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Besked Fremhævning"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Besked Modtaget"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "GMail E-post Modtaget"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6448,7 +6512,7 @@ msgstr ""
 "ikon forbliver på skærmen længe er det sandsynlig\n"
 "at beskeden gik tabt."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6456,74 +6520,74 @@ msgstr ""
 "Teksten under denne linje er hvad der er blevet sagt siden\n"
 "sidste gang du var opmærksom på denne gruppe samtale"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Afslut"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Læs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Slå dette op i Or_dbogen"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbogens URL mangler en \"%s\" og det må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web søge URL'en mangler en \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Søg på nettet efter det"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Åbn som et _Link"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i dage siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Emne: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Jabber ID er allerede i listen"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Den Jabber ID som de skrev er allerede i listen. Vælg en anden."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
@@ -6558,121 +6622,121 @@ msgstr "Kontakt navn"
 msgid "Set Mood"
 msgstr "Sæt Humørstemning"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Besked"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Status Besked"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Besked?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Dette navn er allerede i brug. Vil du overskrive denne status besked?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Gem som Forvalgt Status Besked"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Skriv et navn for denne status besked"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresse:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Fyld ind data for den kontakt som du vil tilføje kontoen med navnet %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Fyld ind data for den kontakt som du vil tilføje"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruger ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "Bruger ID'en må ikke indeholde en resource."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke tilføje dig selv til kontaktvinduet."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakten er allerede i kontaktvinduet"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Denne kontakt er allered i dit kontaktvindue"
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Bruger ID:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabber klient"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Nuværende Programudviklere:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Tidligere Programudviklerer:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "TAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Sidst men ikke mindst, vil vi gerne takke alle pakke vedligeholdere."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6685,88 +6749,98 @@ msgstr ""
 "\n"
 "Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Kælenavnet har ikke tilladte tegn."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Forespørgsel på abonnering for konto %(account)s fra %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Forespørgsel om abonnering fra %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i en gruppe samtale %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan kun deltage i en gruppe samtale hvis du er tilsluttet."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Deltag i Gruppe Samtale med kontoen %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Ugyldigt kontonavn"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Vælg den konto som du vil slutte dig til rummet med"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kælenavn"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppe samtale Jabber ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet på en gruppe samtale."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan kun synkronisere dine kontakter når du er tilsluttet."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Denne konto er ikke tilsluttet til serveren"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan kun synkronisere med en konto hvis du er tilsluttet."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start en samtale med konto %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6775,301 +6849,301 @@ msgstr ""
 "en besked til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vær venligst sikker på at du er tilsluttet med \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke fortolke \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan kun ændre din adgangskode hvis du er tilsluttet."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Ugyldig adgangskode"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Du må indtaste en adgangskode."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Adgangskoderne er ikke ens"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Adgangskoderene i de to tekstindtastningsfelter må være identiske."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt Loggede Ind"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggede Ud"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Ny Besked"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Ny Enkel Besked"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Ny Privat Besked"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Filoverførsel Fejl"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Filoverførsel er Fuldført"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Filoverførsel Stoppede"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale Invitation"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt Ændrede Status"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Besked med konto %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Besked i konto %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Enkel Besked"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Modtaget %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Formular %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsol for %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Konsol"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Jeg vil gerne tilføje dig til min kontakt liste."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr ""
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Gnaven"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Gruppe"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatlivs Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rækkefølge: %(order)s, handling: %(action)s, type: %(type)s, værdi: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rækkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Tilføj en regel</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Privatlivs lister"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Ugyldig Listenavn"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må indtaste et navn for at skabe en privatlivs liste."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har inviteret dig til at deltage i en diskussion"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 "$Contact har inviteret dig til at deltage i en gruppe samtale %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Vil du acceptere denne invitation?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Vælg Lyd"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav Lyde"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Vælg Billede"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Billeder"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s bliver:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Tilføj Speciel Påmindelse for %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "når jeg er"
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7080,19 +7154,19 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng er: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verificeret denne kontakts identitet."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet er verificeret"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Verificer igen..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7102,19 +7176,19 @@ msgstr ""
 "beskeder eller sende dig beskeder, må du verificere deres identitet ved at "
 "trykke på knappen under."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet er IKKE verificeret"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Verificer..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Har du bekræftet den kontaktens identitet?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7129,23 +7203,23 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med den fjerne kontakt og verificeret KÆS?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøgle (%s) <b>passer ikke</b> til den angivne nøgle i Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøgle er tildelt denne kontakt. Derfor kan du ikke kryptere "
 "beskeder."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7154,7 +7228,7 @@ msgstr ""
 "nøgle</b>, så beskeder <b>kan ikke</b> krypteres. Brug din GPG klient til at "
 "ændre dette."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7249,20 +7323,20 @@ msgstr "Beskrivelse"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Bogmærke er allerede sat"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Bogmærket er blevet tilføjet succesfuldt"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "De kan håndtere dine bogmærker via Handlings menuen i dit kontaktvindue."
@@ -7275,15 +7349,15 @@ msgstr "Abonnerede"
 msgid "Node"
 msgstr "Knude"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Frameld abonnement"
 
@@ -7739,31 +7813,31 @@ msgstr "Gajim behøver en X server for at kunne køre. Slutter..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim behøver PyGTK 2.8 eller højere"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim behøver PyGTK 2.8 eller højere for at køre. Slutter..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim behøver GTK 2.8 eller højere"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim behøver GTK 2.8 eller højere for at køre. Slutter..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ udførselsmiljø mangler libglade understøttelse"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7772,22 +7846,22 @@ msgstr ""
 "Fjern venligst dit nuværende GTK+ udførselsmiljø og installer den sidste "
 "stabile version fra %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Hver venligst sikker på at GTK+ og PyGTK har libglade understøttelse på dit "
 "system."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim behøver PySQLite2 for at køre"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim behøver pywin32 for at køre"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7797,11 +7871,11 @@ msgstr ""
 "det fra %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim kører allerede"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7809,35 +7883,35 @@ msgstr ""
 "En anden instans af Gajim ser ud til at køre\n"
 "Kør alligevel?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Adgangskode Påkrævet"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Indtast adgangskoden til GPG nøglen %(keyid)s (Konto %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Ingen GPG nøgle valgt"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Forkert Adgangskode"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Indtast din GPG adgangskode igen eller annuller."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7848,59 +7922,59 @@ msgstr ""
 "anden indehaver.\n"
 "Specificer venligst et andet kælenavn under:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Accepterer du denne forespørsel?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterer du denne forespørgsel for konto %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisering for %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Tilslutning Fejlede"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fejl %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fejl opstod under sending %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Abonnement Forespørgsel"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorisering accepteret"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkendt dig til at se hans eller hendes status."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7908,78 +7982,78 @@ msgstr ""
 "Du vil altid se ham eller hende som offline.\n"
 "Vil du fjerne ham eller hende fra din kontakt liste?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Frameld abonnement"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke blive etableret"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nu kendt som %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nu %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har sat emnet til %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "En ændring i en non-privacy-related rum konfiguration har forekommet"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Rum logging er nu aktiveret"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Rum logging er nu deaktiveret"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Rummet er nu ikke-anonymt"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Rummet er nu semi-anonymt"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Rummet er nu helt anonymt"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "En adgangskode er påkrævet for at deltage i rummet %s. Venligst skriv den."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7987,20 +8061,25 @@ msgstr ""
 "Du har konfigureret Gajim til at bruge GPG agenten, men der er ingen GPG "
 "agent som kører eller den returnerede en forkert gpg-løsen.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er for øjeblikket tilsluttet uden din OpenPGP nøgle."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Dit pgp-løsen er ikke korrekt"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Dit pgp-løsen er ikke korrekt"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG er ikke brugbar"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -8009,13 +8088,14 @@ msgstr ""
 "Ingen GPG nøgle er tildelt denne kontakt. Derfor kan du ikke kryptere "
 "beskeder."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "Ikke spørg mig ige_n"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8024,19 +8104,19 @@ msgstr ""
 "Gnomes Nøglering er installeret men ikke \t\t\t\t\t\t\t startet korrekt "
 "(miljøvariabel er sandsynligvis ikke \t\t\t\t\t\t\t sat op rigtig)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Du har %d ny e-post samtale"
 msgstr[1] "Du har %d nye e-post samtaler"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8051,44 +8131,44 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vil gerne sende dig en fil."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fejl ved læsning af fil:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har succesfuldt modtaget %(filename)s fra %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har succesfuldt sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8097,36 +8177,36 @@ msgstr ""
 "Ikke i stand til at dekryptere beskeden fra %s\n"
 "Det er mulig den er blevet forfalsket."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Ikke i stand til at dekryptere beskeden"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Brugernavns Konflikt"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Skriv et nyt brugernavn for din lokale konto"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s .s)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Fejl."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Ressource Konflikt"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8134,11 +8214,11 @@ msgstr ""
 "Du er allerede tilsluttet til denne konto med den samme ressource. Skriv "
 "venligst en ny"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Fejl under verificering af SSL certifikat"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8149,15 +8229,15 @@ msgstr ""
 "server: %(error)s\n"
 "Vil du stadig prøve på at forbinde til denne server?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne fejl for dette certifikat."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "SSL certifikat fejl"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8174,11 +8254,11 @@ msgstr ""
 "\n"
 "Vil du stadig forbinde og opdatere fingeraftrykket for certifikatet?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Ikke sikker forbindelse"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8186,11 +8266,11 @@ msgstr ""
 "Du er ved at sende din adgangskode over en ikke krypteret forbindelse. Er du "
 "sikker på du vil gøre dette?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg vil virkelig gerne tilslutte mig uden sikkerhed"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8199,21 +8279,21 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "PEP knude blev ikke fjernet"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP knude %(node)s blev ikke fjernet: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8221,7 +8301,7 @@ msgstr ""
 "Dit konfigurerede følelsesikon tema blev ikke fundet, så følelsesikoner er "
 "blevet deaktiveret."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8231,13 +8311,13 @@ msgstr ""
 "opdatere formatet for filen emoticons.py. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke deltage i en gruppe samtale mens du er usynlig"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke gemme din opsætning og indstillinger"
 
@@ -8271,12 +8351,13 @@ msgstr ""
 "på en separat linie"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "Konto"
 
@@ -8301,9 +8382,9 @@ msgstr "status"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en af: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "besked"
 
@@ -8321,23 +8402,48 @@ msgstr ""
 "indstillingen"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Ændrer status for kontoen eller kontoer"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_tet:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Jeg vil _registrere en ny konto"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"Ændre status for konto \"konto\". Hvis ikke spesificeret, prøv at ændre "
+"status for alle kontoer der har sat \"synkroniser med generel status\" "
+"indstillingen"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende beskeder til en kontakt"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "Kontaktens JID som du vil samtale med"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "hvis specificeret vil kontakten tages fra kontaktlisten fra denne konto"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8347,29 +8453,29 @@ msgstr ""
 "konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP nøgle', "
 "bare set 'OpenPGP nøgle' til ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID på den kontakt som skal modtage beskeden"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "besked indhold"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp nøgle"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hvis specificeret vil beskeden blive krypteret med denne nøgle"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "hvis specificeret vil beskeden blive sendt med denne konto"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8379,139 +8485,139 @@ msgstr ""
 "nøgle og konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP "
 "nøgle', bare set 'OpenPGP nøgle' til ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "emne"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "emne på besked"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Send en ny besked til en gruppesamtale du deltager i."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID på den rum som skal modtage beskeden"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Få detaljeret information om kontakten"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Kontaktens JID"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Få detaljeret information om kontoen"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Send en fil til en kontakt"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Filsti"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "hvis specificeret vil filen blive sendt med denne konto"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Hvis alle indstillinger og deres værdier"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sætter værdien for 'nøglen' til 'værdi'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "nøgle=værdi"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'nøgle' er navnet for indstillingen, 'værdi' er den værdi den er sat til"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Sletter et indstillingspunkt"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "nøgle"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "navn på den indstilling som skal slettes"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Skriver den nuværende tilstand af Gajims indstillinger til .config filen"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Tilføjer kontakt til kontaktvinduet"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Tilføjer ny kontakt til denne konto"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnere den nuværende status (den globale status hvis ikke en konto er "
 "valgt)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnere den nuværende statusbesked (den globale status besked hvis ikke en "
 "konto er valgt)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returnerer antal ikke læste beskeder"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åbner 'Start Samtale' vinduet"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Starter en samtale med denne konto"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Sender tilpasset XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML som skal sendes"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8519,72 +8625,72 @@ msgstr ""
 "Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
 "blive sendt til alle kontoer"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndter en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI som skal håndteres"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Den konto som du vil håndtere det med"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "besked indhold"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Deltag i et MUC rum"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "rum"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "Rum JID"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "kælenavn"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Kælenavn som skal bruges"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "adgangskode"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Adgangskode for at slutte sig til rummet"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Vælg den konto som du vil slutte dig til rummet med"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Kontroller om Gajim kører"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Viser eller gemmer ipython vinduet"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Manglende argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8593,15 +8699,15 @@ msgstr ""
 "'%s' er ikke i dit kontaktvindue.\n"
 "Specificer venligst en konto for at sende beskeden."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ud til at Gajim ikke kører. Så du kan ikke bruge gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8610,16 +8716,16 @@ msgstr ""
 "Brug: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke fundet"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8628,7 +8734,7 @@ msgstr ""
 "Brug: %s kommando [argumenter]\n"
 "Kommando er en af:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8637,7 +8743,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8646,7 +8752,7 @@ msgstr ""
 "Argument \"%(arg)s\" er ikke specificeret. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Forkert uri"
 
@@ -8675,294 +8781,154 @@ msgstr "Du kan ikke slette det nuværende tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vælg venligst en anden for dit nuværende tema."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Sending af privat besked fejlede"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke længere i gruppe samtale \"%(room)s\" eller \"%(nick)s\" har "
 "forladt rummet."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Indsæt Kælenavn"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Samtale med "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Fortsat samtale"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Rum logging er aktiveret"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Et nyt rum er blevet oprettet"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har fastsat eller ændret dit kælenavn for rummet"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s er blevet udvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s er blevet udvist af %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blevet uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s er blevet uønsket af %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "tilknytning ændret"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "Rum konfiguration er blevet ændret til 'kun for medlemmer'"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "computeren slukkes"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilhørsforholdet for %(nick)s er blevet sat til %(affiliation)s af %"
 "(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilhørsforholdet for %(nick)s er blevet sat til %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(nick)s rolle er blevet sat til %(role)s af %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s rolle er blevet sat til %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s har forladt samtalen"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Kælenavn ikke fundet: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Denne gruppe samtale har ikke noget emne"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Inviterede %(contact_jid)s til %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Kælenavn ikke fundet: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Brug: /%s <kælenavn|JID> [begrundelse], udviser denne JID fra gruppe "
-"samtalen. Kælenavnet til en bruger kan bruges, men ikke hvis det indeholder "
-"\"@\". Hvis en bruger med JID'en er tilstede i gruppe samtalen vil han/hun/"
-"den/det også blive udvist. Mellemrum i kælenavnet er ikke understøttet."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Brug: /%s <kælenavn>, åbner et privat samtale vindue med den specificerede "
-"bruger."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Brug: /%s [begrundelse], lukker det nuværende vindue eller fan, visende "
-"begrundelsen hvis specificeret."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Brug: /%s <JID> [begrundelse], inviter JID til den nuværende gruppe samtale, "
-"visende begrundelsen hvis specificeret"
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Brug: /%s <rum>@<server>[/kælenavn], tilbyder at deltage i rum@server "
-"eventuelt med det specificerede kælenavn."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Brug: /%s <kælenavn> [begrundelse], fjerner deltager med kælenavnet fra "
-"gruppe samtalen og hvis specificeret, viser en begrundelse"
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Brug: /%s <kælenavn> [besked], åbner et privat samtale vindue og sender "
-"beskeden til deltageren med det specificerede kælenavn."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Brug: /%s <kælenavn>, ændrer dit kælenavn i den nuværende gruppe samtale."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Brug: /%s , viser navnene på deltagerne i gruppe samtalen."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Brug: /%s [emne], viser eller opdaterer det nuværende gruppe samtale emne."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Brug: /%s <besked>, sender en besked uden at kigge efter andre kommandoer."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Brug: /%s <kælenavn>, ændrer dit kælenavn i den nuværende gruppe samtale."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på du vil forlade gruppe samtalen \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Hvis du lukker dette vindue vil du blive frakoblet fra denne gruppe samtale."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Ændre emne"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Anfør et nyt emne:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Ændre kælenavn"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Anfør dit nye kælenavn:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Fjern %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8970,22 +8936,22 @@ msgstr ""
 "Du er ved at definitivt fjerne dette rum.\n"
 "Du kan anføre en grund herunder:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også indtaste et alternativt mødested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparker %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Du kan anføre en begrundelse under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Udeluk %s"
@@ -9057,6 +9023,14 @@ msgstr "Billede kan ikke gemmes i formatet %(type)s. Gem som %(new_filename)s?"
 msgid "Save Image as..."
 msgstr "Gem Billede som..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Ny Gruppe Samtale"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finde historik log databasen"
@@ -9138,52 +9112,62 @@ msgstr "Konversations Historik med %s"
 msgid "Disk Error"
 msgstr "Disk Skrivefejl"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Fejl besked: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Fejl."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nu: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Tidsudløb nået for at laste billede"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Billede er for stort"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Du er ikke tilsluttet til serveren"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Vil du virkelig slette den valgte besked?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Beskeder"
 
@@ -9244,18 +9228,18 @@ msgstr "_Ignorer"
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Kunne ikke laste billede"
 
@@ -9287,48 +9271,48 @@ msgstr ""
 "Der var en fejl under publicering af din personlige information, prøv igen "
 "senere."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Flettede kontoer"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Godkendelse er blevet sendt"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu vil %s vide din status."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Forespørgsel på abonnering er blevet sendt"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Hvis %s accepterer denne forespørsel vil du kunne se hans eller hendes "
 "status."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Godkendelse er blevet fjernet"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu vil %s altid se dig som offline."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG er ikke brugbar"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Du deltager i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9336,28 +9320,28 @@ msgstr ""
 "Hvis du ændrer din status til usynlig vil det resultere i at du bliver "
 "frakoblet fra disse gruppesamtaler. Er du sikker på du vil gøre dig usynlig?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "ikke synkroniseret"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på du vil forlade gruppe samtalen \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Du har ulæste beskeder"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9365,16 +9349,16 @@ msgstr ""
 "Beskeder vil kun være tilgængelige for læsning senere hvis du har historik "
 "aktiveret og kontakten er i dit kontaktvindue."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Du må læse dem før du fjerner denne transport."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil blive fjernet"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9382,11 +9366,11 @@ msgstr ""
 "Du vil ikke længere være i stand til at sende og modtage beskeder fra "
 "kontakter som bruger denne transport."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transporter vil blive fjernet"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9395,57 +9379,68 @@ msgstr ""
 "Du vil ikke længere være i stand til at sende og modtage beskeder fra "
 "kontakter som bruger disse transporter: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Du er ved at oprette en metakontakt. Er du sikker på du vil fortsætte?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Omdøb Kontakt"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Indtast et nyt kælenavn for kontakt %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Omdøb Gruppe"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Indtast et nyt navn for gruppen %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Fjern Gruppen"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Vil du fjerne gruppen %s fra kontaktvinduet?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Fjern også alle kontakter i denne gruppe fra kontaktvinduet"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Tildel OpenPGP Nøgle"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Vælg den nøgle du vil anvende til kontakten"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt %s vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9454,11 +9449,11 @@ msgstr ""
 "vil altid se dig som offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9466,16 +9461,16 @@ msgstr ""
 "Ved at fjerne denne kontakt fjerner du også samtidig godkendelsen, så han "
 "eller hun altid vil se dig som offline."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Jeg vil at denne kontakt kan se min status efter den er blevet fjernet"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9485,20 +9480,33 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Du er ved at oprette en metakontakt. Er du sikker på du vil fortsætte?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Ingen konto tilgængelig"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Du må oprette en konto før du kan begynde en samtale med andre kontakter."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakt lagring er ikke understøttet af din server"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9507,12 +9515,12 @@ msgstr ""
 "information. Så denne information vil ikke blive gemt til næste gang du "
 "tilslutter dig."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Du er ved at oprette en metakontakt. Er du sikker på du vil fortsætte?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9521,23 +9529,23 @@ msgstr ""
 "Metakontakter er en måde at gruppere flere kontakter på en linie. Oftest "
 "bruges det når den samme person har flere Jabber eller transport kontoer."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Ugyldig Fil URI:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vil du sende denne fil til %s:"
 msgstr[1] "Vil du sende disse filer til %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Send %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Send en fil til en kontakt"
@@ -9547,115 +9555,127 @@ msgstr "Send en fil til en kontakt"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "med konto %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "til %s konto"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "bruger %s konto"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Håndter Bog_mærker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "fra konto %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Ændre Status Besked"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Publicer Melodi"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Tilpas Tjenester..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maksimer alt"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Send Gruppeb_esked"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Til alle brugere"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Til alle brugere på net"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Håndter Kontakter"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Ændre _Grupper"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Send Enkel Besked"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Kør Kommando..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "Hå_ndter Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Modificer Transport"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Omdøb"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "Afbry_d tilslutningen"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Ny Gruppe Samtale"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "Afbry_d tilslutningen"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Historik Håndterer"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Deltag i Ny Gruppe Samtale"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Ændre Status Besked..."
 
@@ -9672,20 +9692,20 @@ msgstr "Fejl i modtaget dataform"
 msgid "No result"
 msgstr "Intet resultat"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Disk SkriveFejl"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Bekræft disse sessions indstillinger"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9700,7 +9720,7 @@ msgstr ""
 "\n"
 "\tKan disse indstillinger godkendes?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9897,6 +9917,135 @@ msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 msgid " resource with priority "
 msgstr " ressource med prioritet "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Tilføj Speciel _Påmindelse"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Tilskriv Open_PGP Nøgle"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Kommando er ikke understøttet for zeroconf konto."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Kommandoer: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Brug: /%s, rydder tekst vinduet"
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Brug: /%s, gem samtale knapper"
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Brug: /%(command)s <handling>, sender handling til den nuværende gruppe "
+#~ "samtale. Brug tredie person. (f.eks. /%(command)s eksploderer.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Brug: %s, sender en ping til kontakten"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Brug: /%s, send beskeden til kontakten"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Ingen hjælp for /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Aktiver link-local/zeroconf beskeder"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Kælenavn ikke fundet: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Denne gruppe samtale har ikke noget emne"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Inviterede %(contact_jid)s til %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Kælenavn ikke fundet: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Brug: /%s <kælenavn|JID> [begrundelse], udviser denne JID fra gruppe "
+#~ "samtalen. Kælenavnet til en bruger kan bruges, men ikke hvis det "
+#~ "indeholder \"@\". Hvis en bruger med JID'en er tilstede i gruppe samtalen "
+#~ "vil han/hun/den/det også blive udvist. Mellemrum i kælenavnet er ikke "
+#~ "understøttet."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Brug: /%s <kælenavn>, åbner et privat samtale vindue med den "
+#~ "specificerede bruger."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Brug: /%s [begrundelse], lukker det nuværende vindue eller fan, visende "
+#~ "begrundelsen hvis specificeret."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Brug: /%s <JID> [begrundelse], inviter JID til den nuværende gruppe "
+#~ "samtale, visende begrundelsen hvis specificeret"
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Brug: /%s <rum>@<server>[/kælenavn], tilbyder at deltage i rum@server "
+#~ "eventuelt med det specificerede kælenavn."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Brug: /%s <kælenavn> [begrundelse], fjerner deltager med kælenavnet fra "
+#~ "gruppe samtalen og hvis specificeret, viser en begrundelse"
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Brug: /%s <kælenavn> [besked], åbner et privat samtale vindue og sender "
+#~ "beskeden til deltageren med det specificerede kælenavn."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Brug: /%s <kælenavn>, ændrer dit kælenavn i den nuværende gruppe samtale."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Brug: /%s , viser navnene på deltagerne i gruppe samtalen."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Brug: /%s [emne], viser eller opdaterer det nuværende gruppe samtale emne."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Brug: /%s <besked>, sender en besked uden at kigge efter andre kommandoer."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Brug: /%s <kælenavn>, ændrer dit kælenavn i den nuværende gruppe samtale."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Tryk for at se egenskaber (som MSN, ICQ transporter) på jabber serveren"
diff --git a/po/de.po b/po/de.po
index d8a64ccd6..6a5d40c83 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:38+0200\n"
 "Last-Translator: Nico Gulden <cilugnedon@gmx.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
@@ -217,6 +217,7 @@ msgstr "<b>Persönliche Informationen</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Konto"
 
@@ -284,8 +285,8 @@ msgstr "Persönliche Informationen bearbeiten …"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -296,8 +297,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Allgemein"
 
@@ -358,25 +359,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informationen über Sie, die auf dem Server gespeichert sind"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Kein Schlüssel ausgewählt"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Kein Proxy"
 
@@ -536,8 +533,8 @@ msgstr ""
 "Eventuell müssen Sie dazu Ihre Firewall-Einstellungen ändern."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
@@ -551,7 +548,7 @@ msgid "Mer_ge accounts"
 msgstr "Konten _zusammenführen"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "_Umbenennen"
 
@@ -803,7 +800,7 @@ msgid "All statuses"
 msgstr "Alle Status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Abwesend"
 
@@ -820,7 +817,7 @@ msgid "Have "
 msgstr "habe "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -829,7 +826,7 @@ msgid "Launch a command"
 msgstr "Einen Befehl ausführen"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
@@ -1015,7 +1012,7 @@ msgid "Join _Group Chat"
 msgstr "_Chatraum betreten …"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "Zur Kont_aktliste hinzufügen …"
 
@@ -1041,40 +1038,6 @@ msgstr "Link im Br_owser öffnen"
 msgid "_Start Chat"
 msgstr "Chat _starten"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "_Kontakte einladen"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "_Datei senden"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "ESession-Verschlüsselung aktivieren"
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Open_PGP-Verschlüsselung aktivieren"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "Zur Kont_aktliste hinzufügen"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Verlauf"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "_Einladen zu"
@@ -1099,6 +1062,122 @@ msgstr ""
 "Sie möchten einen Multi-User-Chat beginnen.\n"
 "Bitte wählen Sie die Kontakte, die Sie einladen möchten"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Kontakt darum bitten, seinen Status ein_sehbar zu machen"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Spezielle Be_nachrichtigung hinzufügen …"
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Open_PGP-Schlüssel zuweisen …"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Befehl ausführen …"
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "_Gruppen bearbeiten …"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "_Einladen zu"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "_Kontakte einladen"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "Ent_fernen"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Benu_tzerdefinierten Status senden"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Einzelne _Nachricht senden …"
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "_Datei senden …"
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Benutzerdefinierten Avatar wählen …"
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "_Chat starten"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "ESession-Verschlüsselung aktivieren"
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Open_PGP-Verschlüsselung aktivieren"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "Erlaube dem Kont_akt, meinen Status zu sehen"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Blockieren"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Verbiete dem Kontakt, meinen Status zu sehen"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Verlauf"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignorieren"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "Kontakt _verwalten"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Umbenennen …"
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Abonnement"
+
+# TODO: Review by german translators
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Entblocken"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "Ignorieren a_ufheben"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Bitte füllen Sie das Formular aus."
@@ -1220,7 +1299,7 @@ msgstr ""
 "Kontakt-Reihe\n"
 "Chat-Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Fett"
 
@@ -1244,7 +1323,7 @@ msgstr "Weg"
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1286,7 +1365,7 @@ msgstr "Spitz_name ändern …"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
 msgid "Change _Subject..."
-msgstr "_Design ändern …"
+msgstr "_Thema ändern …"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
 msgid "Configure _Room..."
@@ -1316,6 +1395,14 @@ msgstr "Mo_derator"
 msgid "Occupant Actions"
 msgstr "Benutzeraktionen"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "_Datei senden"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "Zur Kont_aktliste hinzufügen"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1324,13 +1411,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Blockieren"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Rausschmeißen"
@@ -1347,14 +1427,6 @@ msgstr "_Besitzer"
 msgid "_Send Private Message"
 msgstr "Private Nachricht _senden"
 
-# TODO: Review by german translators
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Entblocken"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Stimme verleihen"
@@ -1363,7 +1435,7 @@ msgstr "_Stimme verleihen"
 msgid "Create new post"
 msgstr "Neue Nachricht"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Von"
 
@@ -1388,8 +1460,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Willkommen im Gajim-Verlaufsmanager</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1443,34 +1515,40 @@ msgstr "Suchen:"
 msgid "_Log conversation history"
 msgstr "Unterhaltungsver_lauf"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+# TODO: Synchronize with other strings concerning bookmarks
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Diesen Chatraum speichern (Strg+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Chatraum betreten"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Betritt diesen Chatraum automatisch, wenn ich mich verbinde"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Spitzname:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Kürzlich:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Chatraum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Betreten"
@@ -1499,7 +1577,7 @@ msgstr "Minimieren bei automatischem Beitritt"
 msgid "Print status:"
 msgstr "Status anzeigen:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2042,7 +2120,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Kontakte nach Status sortieren"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2214,35 +2292,40 @@ msgid "All"
 msgstr "allen"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "Kontakten, die:"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Erlaube"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Verbiete"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "der Jabber-ID:"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Privatsphären-Liste"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "Kontakten, die:"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "allen in der Gruppe"
 
 # TODO: Review original string
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2254,19 +2337,19 @@ msgstr ""
 "nicht in Ihrer Liste stehen, in deren Liste Sie aber stehen\n"
 "in Ihrer Liste stehen, in deren Liste Sie aber nicht stehen"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "mir Nachrichten zu senden"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "mir Anfragen zu schicken"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "mir seinen/ihren Status zu senden"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "meinen Status zu sehen"
 
@@ -2434,97 +2517,11 @@ msgstr "Konto entfernen (in Gajim und auf dem _Server)"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Kontakt darum bitten, seinen Status ein_sehbar zu machen"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Spezielle Be_nachrichtigung hinzufügen …"
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Open_PGP-Schlüssel zuweisen …"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "_Gruppen bearbeiten …"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Befehl ausführen …"
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "_Einladen zu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "Ent_fernen"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Benu_tzerdefinierten Status senden"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Einzelne _Nachricht senden …"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "_Datei senden …"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Benutzerdefinierten Avatar wählen …"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "_Chat starten"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "Erlaube dem Kont_akt, meinen Status zu sehen"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Verbiete dem Kontakt, meinen Status zu sehen"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignorieren"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "Kontakt _verwalten"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Umbenennen …"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Abonnement"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "Ignorieren a_ufheben"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2630,7 +2627,7 @@ msgstr "Einzelne _Nachricht senden …"
 
 #: ../data/glade/roster_window.glade.h:26
 msgid "_View"
-msgstr "_Ansicht"
+msgstr "A_nsicht"
 
 #: ../data/glade/search_window.glade.h:1
 msgid "Please wait while retrieving search form..."
@@ -2645,7 +2642,7 @@ msgid "_Add contact"
 msgstr "_Kontakt hinzufügen"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Informationen"
 
@@ -2859,27 +2856,6 @@ msgstr "_Nachricht"
 msgid "_Presence"
 msgstr "_Anwesenheit"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Spezielle Be_nachrichtigung hinzufügen"
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Open_PGP-Schlüssel zuweisen"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "_Gruppen bearbeiten"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Umbenennen"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Konto bearbeiten …"
@@ -2924,48 +2900,48 @@ msgid "Service returned an error."
 msgstr "Der Dienst gab einen Fehler zurück."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Aktiviert"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Deaktiviert"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Ganzzahl"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Farbe"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Einstellungsname"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Wert"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Keine)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Versteckt"
 
@@ -2979,140 +2955,140 @@ msgstr "Sie haben einen neuen Eintrag erhalten:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Englisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Weißrussisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretonisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Deutsch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Britisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Baskisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Französisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norwegisch (Bokmål)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brasilianisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Russsich"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovakisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Sprache für die Rechtschreibprüfung"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 msgid "Strike"
 msgstr "Durchgestrichen"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 msgid "Clear formating"
 msgstr "Formatierung löschen"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Datei wirklich senden?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
@@ -3120,46 +3096,45 @@ msgstr ""
 "kennen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG-Verschlüsselung aktiviert"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Nicht in der Kontaktliste"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Eine Liste der aktiven, fertigen und angehaltenen Dateiübertragungen"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Unbekannter Künstler"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Unbekannter Titel"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Unbekannte Quelle"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3168,19 +3143,19 @@ msgstr ""
 "<b>\"%(title)s\"</b> von <i>%(artist)s</i>\n"
 "aus <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s aus dem Chatraum %(room_name)s"
 
 # TODO: GPG/PGP unification in original strings needed
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Kein GPG-Schlüssel zugewiesen"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3189,50 +3164,50 @@ msgstr ""
 "GPG verschlüsselt werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Sitzung WIRD aufgezeichnet"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Sitzung WIRD NICHT aufgezeichnet"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "ist"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "ist NICHT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "wird"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "wird NICHT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "und NICHT authentifiziert"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3241,67 +3216,23 @@ msgstr ""
 "%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n"
 "Ihre Chatsitzung %(logged)s mitgeschrieben."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Der Befehl für das Zeroconf-Konto wird nicht unterstützt."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Befehle: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Verwendung: /%s, leert das Textfenster."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Verwendung: /%s, versteckt die Chatschaltflächen."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Verwendung: /%(command)s <Aktion>, sendet eine Aktion an den aktuellen "
-"Chatraum. Verwenden Sie die Person Singular, z.B. mit /%(command)s kratzt "
-"sich am Kinn)."
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Verwendung: /%s, sendet einen Ping zum Kontakt."
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Keine Hilfe vorhanden für /%s."
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Sitzungsaushandlung abgebrochen"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Diese Sitzung ist verschlüsselt"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " und wird AUFGEZEICHNET"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " und wird NICHT AUFGEZEICHNET"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3309,25 +3240,25 @@ msgstr ""
 "Die Identität des Gesprächspartners wurde nicht überprüft. Mehr "
 "Informationen durch Klicken auf das Schild-Symbol."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Die folgende Nachricht wurde UNVERSCHLÜSSELT übertragen"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Die folgende Nachricht wurde verschlüsselt übertragen"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\" erhalten"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3335,15 +3266,15 @@ msgstr ""
 "Wenn Sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
 "Nachricht verloren."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3352,7 +3283,7 @@ msgstr ""
 "Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu "
 "reparieren oder zu löschen (dabei gehen alle Verläufe verloren)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ist jetzt %(status)s"
@@ -3361,23 +3292,23 @@ msgstr "%(name)s ist jetzt %(status)s"
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s ist eine Datei, sollte aber ein Verzeichnis sein"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s ist ein Verzeichnis, sollte aber eine Datei sein"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
@@ -3441,9 +3372,9 @@ msgstr "Wählen Sie die Chaträume, die Sie verlassen möchten"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Gruppenchat"
 
@@ -3459,57 +3390,102 @@ msgstr "Ungelesene Nachrichten weiterleiten"
 msgid "All unread messages have been forwarded."
 msgstr "Alle ungelesenen Nachrichten wurden weitergeleitet."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr "Klang abspielen, wenn der Benutzer beschäftigt ist"
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 "Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 "Nur die Kontakte in der Kontaktliste anzeigen, die Verfügbar oder Frei zum "
 "Chatten sind."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Zeit in Minuten, nach der Ihr Status auf Abwesend gesetzt wird"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Abwesend wegen Untätigkeit für mehr als $T Minuten)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die "
 "Abwesenheitszeit."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Zeit in Minuten, nach der Ihr Status auf nicht verfügbar gesetzt wird."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nicht verfügbar wegen Untätigkeit seit mehr als $T Minuten)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Nicht-"
 "Verfügbar-Zeit."
 
 # FIXME: Check English
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Legt fest, wann das Systemleisten-Symbol angezeigt wird. Mögliche Werte: "
 "'never', 'on_event', 'always'."
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Ungültiger Benutzername"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "Statusnachricht"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Ungültiger Benutzername"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Spitzname ändern"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "Statusnachricht"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3517,21 +3493,17 @@ msgstr ""
 "eingeklappt sind."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "Standard"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Aktiviere Anzeige von Kontakten im LAN über Zeroconf."
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Sprache der Rechtschreibprüfung"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3541,7 +3513,7 @@ msgstr ""
 "'sometimes' - Zeige Zeit alle print_ichat_every_foo_minutes Minuten.\n"
 "'never' - Zeige nie die Zeit."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3552,18 +3524,18 @@ msgstr ""
 "ungenaue Uhr. Die ungenaue Uhr wird nur verwendet, wenn print_time auf "
 "'sometimes' gesetzt ist."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Falls aktiviert, wird */_ nicht entfernt. So wird *abc* fett gedruckt, aber "
 "* * wird nicht entfernt."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3574,7 +3546,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch). (Falls Sie "
 "dieses Feature benutzen möchten, installieren Sie docutils.)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3582,7 +3554,7 @@ msgstr ""
 "Zeichen, das hinter Spitznamen angezeigt wird, wenn die "
 "Spitznamenvervollständigung (Tab) in Chaträumen verwendet wird."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3590,7 +3562,7 @@ msgstr ""
 "Zeichen, das an den gewünschten Spitznamen gehängt wird, falls der dieser im "
 "Chatraum bereits vergeben ist."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3601,19 +3573,19 @@ msgstr ""
 "Weitere Informationen finden Sie in der Python-Dokumentation zu \"strftime\" "
 "unter http://docs.python.org/lib/module-time.html (Englisch)."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Zeichen, die vor dem Spitznamen ausgegeben werden"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Zeichen, die nach dem Spitznamen gedruckt werden"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Sollen * und [n] in den Titel der Kontaktleiste eingefügt werden?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3621,12 +3593,26 @@ msgstr ""
 "Wie viele Zeilen von der vorherigen Unterhaltung angezeigt werden, wenn ein "
 "Tab/Fenster wieder geöffnet wird."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3634,11 +3620,11 @@ msgstr ""
 "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
 "(Standardeinstellung im ICQ-Client Mirabilis)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3647,13 +3633,13 @@ msgstr ""
 "Entweder eine spezielle URL mit %s, wobei %s das Wort / die Phrase ist oder "
 "'WIKTIONARY', was bedeutet, dass das Wörterbuch Wiktionary verwendet wird."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert "
 "werden."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3665,14 +3651,14 @@ msgstr ""
 "(vorausgesetzt, Sie haben listen_to_network_manager nicht auf False gesetzt "
 "und Ihre Konten synchronisieren sich mit dem globalen Status)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Senden von Chatstatus-Benachrichtigungen. Kann auf \"all\", \"composing_only"
 "\" oder \"disabled\" gesetzt werden."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3680,7 +3666,7 @@ msgstr ""
 "Angezeigte Chatstatus-Benachrichtigungen im Chatfenster. Kann auf \"all\", "
 "\"composing_only\" oder \"disabled\" gesetzt werden."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3688,11 +3674,11 @@ msgstr ""
 "Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll "
 "(print_time==sometimes), wird sie alle x Minuten angezeigt."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Chatraum-Tab oder -Fenster geschlossen wird."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3700,7 +3686,7 @@ msgstr ""
 "Immer fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
 "Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3708,13 +3694,13 @@ msgstr ""
 "Niemals fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
 "Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3723,27 +3709,27 @@ msgstr ""
 "Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Rechnernamen "
 "gesendet werden."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Der IEC-Standard legt fest: 1 KiB = 1024 Byte, 1 kB = 1000 Byte."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Neue Ereignisse per Trayicon anzeigen"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Tableiste bei nur einer Unterhaltung anzeigen?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Tab-Grenze im Chatfenster anzeigen?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Schließen-Schaltflächen in Tabs anzeigen?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3756,18 +3742,18 @@ msgstr ""
 "Werte sind sicherer, benötigen jedoch beim Start einer neuen Unterhaltung "
 "mehr Rechenzeit."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Vorschau neuer Nachrichten in der Popup-Benachrichtigung anzeigen?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Eine durch Semikola getrennte Liste von Worten, die in einem Chatraum "
 "hervorgehoben werden sollen."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3776,14 +3762,14 @@ msgstr ""
 "geklickt wird. Diese Option funktioniert nur, wenn das Trayicon verwendet "
 "wird."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Falls aktiviert, wird beim Starten überprüft, ob Gajim der Standard-Jabber-"
 "Client ist."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3791,7 +3777,7 @@ msgstr ""
 "Falls aktiviert, wird auf jedem Tab, der ungelesene Nachrichten enthält, ein "
 "Icon angezeigt. Abhängig vom Chat-Design kann dieses Icon auch animiert sein."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3799,13 +3785,13 @@ msgstr ""
 "Falls aktiviert, wird in der Kontaktliste unter dem Namen eines jeden "
 "Kontaktes dessen Statusnachricht angezeigt, sofern diese nicht leer ist."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Legt die Position des Avatars in der Kontaktliste fest. \"left\" (links) "
 "oder \"right\" (rechts) sind mögliche Optionen."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3813,7 +3799,7 @@ msgstr ""
 "Falls aktiviert, wird jeder Kontakt, der beim letzten Mal keinen Avatar "
 "hatte oder dessen gespeicherter Avatar zu alt ist, nach einem neuen gefragt."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3821,7 +3807,7 @@ msgstr ""
 "Falls deaktiviert, wird keine Statuszeile im Chat angezeigt, wenn ein "
 "Kontakt seinen Status oder seine Statusnachricht ändert."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3835,30 +3821,30 @@ msgstr ""
 "Statusnachrichten anzeigt. Falls \"in_and_out\", wird nur dann ein Status "
 "angezeigt, wenn jemand den Chatraum betritt oder verlässt."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade angemeldet haben."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade abgemeldet haben."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Falls aktiviert, werden wiederhergestellte Nachrichten mit einer etwas "
 "kleineren Schrift als normal dargestellt."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Zeige keinen Avatar für den Transport selbst an."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Kontaktliste nicht in der Taskleiste anzeigen."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3868,7 +3854,7 @@ msgstr ""
 "Ereignisse anstehen (Standardverhalten der meisten Fenster-Manager; benötigt "
 "GTK+ und PyGTK >= Version 2.8)."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3879,7 +3865,7 @@ msgstr ""
 "Informationen gesendet."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3901,32 +3887,32 @@ msgstr ""
 "einem eigenen Fenster. Eine Änderung dieser Option tritt erst nach einem "
 "Neustart von Gajim in Kraft."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Falls deaktiviert, wird der Avatar nicht mehr im Chatfenster angezeigt."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Falls aktiviert, schließt die Escape-Taste aktive Tabs und Fenster."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Versteckt die Schaltflächen im Chatraum-Fenster."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Versteckt das Banner im Chatraum-Fenster."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Versteckt die Benutzerliste im Chatraum-Fenster."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3934,17 +3920,17 @@ msgstr ""
 "Der Spitzname wird im Chat nur dann vor einer Nachricht angezeigt, wenn sie "
 "nicht von der Person stammt, die schon die letzte Nachricht geschrieben hat."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Einrückung einfügen, wenn das Zusammenführen nachfolgender Spitznamen "
 "verwendet wird."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Sanften Bildlauf im Unterhaltungsfenster verwenden"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3952,13 +3938,13 @@ msgstr ""
 "Liste der Farben, die zum Einfärben der Spitznamen in Chaträumen verwendet "
 "werden sollen (Werte getrennt durch \":\")."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Strg+Tab, um zum nächsten Tab zu wechseln, wenn kein anderer Tab ungelesene "
 "Nachrichten enthält."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3966,7 +3952,25 @@ msgstr ""
 "Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
 "werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
+"werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
+"werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3976,7 +3980,7 @@ msgstr ""
 "Fenster setzen. VORSICHT: Wenn Sie mit einer negativen Priorität angemeldet "
 "sind ehalten Sie keine Nachrichten mehr vom Server."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3984,7 +3988,7 @@ msgstr ""
 "Falls aktiviert, wird der Gnome-Schlüsselbund (falls verfügbar) verwendet, "
 "um die Passwörter der Konten zu speichern."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3993,7 +3997,7 @@ msgstr ""
 "Falls aktiviert, wird der Gnome-Schlüsselbund (falls verfügbar) verwendet, "
 "um die Passwörter der Konten zu speichern."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4001,7 +4005,7 @@ msgstr ""
 "Falls aktiviert, wird die Anzahl der angemeldeten und gesamten Kontakte in "
 "den Konto- und Gruppenreihen angezeigt."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4009,7 +4013,7 @@ msgstr ""
 "Kann leer, 'chat' oder 'normal' sein. Wenn nicht leer, werden alle "
 "eingehenden Nachrichten so behandelt, als wären sie vom gewählten Typ."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4018,7 +4022,7 @@ msgstr ""
 "auswählen, die die letzte Nachricht geschickt hat, falls das Chatfenster "
 "nicht bereits geöffnet ist."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -4026,12 +4030,12 @@ msgstr ""
 "Falls aktiviert, wird Gajim eine Zeichenkette zwischen $$ und $$ mittels "
 "dvips vor dem Einfügen in ein Chatfenster in ein Bild umwandeln."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Wartezeit, bevor das \"Status ändern\"-Fenster automatisch geschlossen wird."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4039,7 +4043,7 @@ msgstr ""
 "Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten "
 "Zeilen werden gelöscht."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4047,11 +4051,11 @@ msgstr ""
 "Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst "
 "an das Systray-Icon angehängt."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Legen Sie den Zeitabstand zwischen den Leerlaufüberprüfungen fest."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4059,7 +4063,7 @@ msgstr ""
 "Legt die LaTeX-Anzeigengröße fest. Je höher der Wert, desto größer die "
 "Anzeige."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4068,13 +4072,23 @@ msgstr ""
 "Gültige URI-Schemata. Nur URIs, die den Schemata in dieser Liste aufgeführt "
 "sind, werden als Links behandelt und hervorgehoben."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4082,7 +4096,7 @@ msgstr ""
 "Die Priorität ändert sich automatisch gemäß dem Status. Die Prioritäten "
 "werden in den \"autopriority_*\"-Optionen festgelegt."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4091,29 +4105,41 @@ msgstr ""
 "Chatten, Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar. (Diese Option "
 "kann nur verwendet werden, wenn \"restore_last_status\" deaktiviert ist.)"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 "Falls aktiviert, wird die zuletzt eingestellte Statusmeldung verwendet."
 
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Falls deaktiviert, wird der Avatar nicht mehr im Chatfenster angezeigt."
+
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/common/config.py:287
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Falls deaktiviert, wird die Anwesenheit selbst dann nicht mit einem GPG-"
 "Schlüssel signiert, wenn GPG konfiguriert ist."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiviere die ESession-Verschlüsselung für dieses Konto."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Soll die ESession-Verschlüsselung automatisch gestartet werden, wenn möglich?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4121,33 +4147,33 @@ msgstr ""
 "Geordnete Liste der auszuprobierenden Verbindungstypen (getrennt durch "
 "Leerzeichen). Mögliche Werte sind TLS, SSL und PLAIN."
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung "
 "übertragen wird."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine mit der Standard-SSL-"
 "Bibliothek geschützte Verbindung übertragen wird."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 "Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4155,11 +4181,11 @@ msgid ""
 msgstr "Wartezeit in Sekunden, bevor eine Verbindung wieder hergestellt wird."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2-Workaround"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4168,15 +4194,15 @@ msgstr ""
 "file_transfer_proxies Option definierten Proxys für den Dateitransfer "
 "verwenden."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Antwort auf Empfangsbestätigungsanfragen"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Empfangsbestätigungen anfordern"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4184,11 +4210,11 @@ msgstr ""
 "Soll beim Aushandeln einer verschlüsselten Sitzung angenommen werden, dass "
 "Sie Ihre Nachrichten aufzeichnen wollen?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4196,102 +4222,102 @@ msgstr ""
 "Soll automatisch eine ESession-Verschlüsselung mit diesem Kontakt gestartet "
 "werden?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprache, die für die Rechtschreibprüfung verwerdet werden soll"
 
 # TODO: Review by german translators: getrennte Status || getrennter Status
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "alle oder durch Leerzeichen getrennte Status"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nein' oder 'beide'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'ja, 'nein' oder ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Arbeiten"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4299,68 +4325,68 @@ msgstr ""
 "Abzuspielender Ton, falls eine Chatraum-Nachricht eines der Wörter aus der "
 "muc_highlights_works-Liste oder Ihren Spitznamen enthält."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "Lebensmittel"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "Menschlich"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Konnte Idle-Modul nicht laden"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Falscher Server"
 
 # TODO: Review by german translators. Get closer to original string and write instead: Ungültige lokale Adresse? :-O
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Ungültige Lokale Adresse!"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Die Registrierungsinformation für den Transport %s sind nicht rechtzeitig "
 "angekommen"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 msgid "Registration succeeded"
 msgstr "Registrierung war erfolgreich"
 
 # FIXME: Type in original string. Should be
 # Registration with agent %s succeeded
 # FIXME: Check English: should be consistently called "transport"
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, fuzzy, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrierung mit Transport %s war erfolgreich"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 msgid "Registration failed"
 msgstr "Registrierung ist fehlgeschlagen"
 
 # FIXME: Type in original string. Should be
 # Registration with agent ...
 # FIXME: Check English: should be consistently called "transport"
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4368,41 +4394,41 @@ msgstr ""
 "Registrierung mit Transport %(agent)s ist mit Fehler %(error)s "
 "fehlgeschlagen: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Unsichtbarkeit wird nicht unterstützt"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Das Konto %s unterstützt keine Unsichtbarkeit."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 "Es wurde eine Nachricht von einer ungültigen Jabber-ID empfangen. Die "
 "Nachricht wurde ignoriert."
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4412,78 +4438,85 @@ msgstr ""
 "reparieren (http://trac.gajim.org/wiki/DatabaseBackup (Englisch)) oder zu "
 "löschen (dabei gehen alle Verläufe verloren)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Spitzname nicht erlaubt: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Fehler beim Betreten des Chatraums"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Sie wurden aus dem Chatraum %s verbannt."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Der Chatraum %s existiert nicht."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Die Chatraumerstellung ist eingeschränkt."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr ""
 "Sie müssen Ihren registrierten Spitznamen in diesem Chatraum %s verwenden."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Sie stehen nicht in der Mitgliedliste des Chatraums %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Der Chatraum wurde gelöscht"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Sie haben jetzt %s abonniert"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Beendigung des Abonnements von %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4493,231 +4526,215 @@ msgstr ""
 "hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool wie <http://jru."
 "jabberstudio.org/>, um sie zu entfernen."
 
-# TODO: GPG/PGP unification in original strings needed
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Keine OpenPGP-Passphrase gewählt."
-
-# TODO: GPG/PGP unification in original strings needed
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Das Zertifikat des Ausstellers ist nicht verfügbar."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Die Zertifikats-CRL ist nicht verfügbar."
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Die Zertifikatsunterschrift konnte nicht entschlüsselt werden."
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Die CRL-Unterschrift konnte nicht entschlüsselt werden."
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Der öffentliche Schlüssel konnte nicht entschlüsselt werden."
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Fehler bei der Zertifikat-Unterschrift"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Fehler bei der CRL-Unterschrift"
 
 # TODO: How should we handle full sentences that miss a . at their end in the original string?
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Das Zertifikat ist noch nicht gültig."
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen."
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "Die CRL ist nocht nicht gültig."
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "Die CRL ist abgelaufen."
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Formatfehler im \"notBefore\"-Feld des Zertifikats"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Formatfehler im \"notAfter\"-Feld des Zertifikats"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formatfehler im \"lastUpdate\"-Feld der CRL"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formatfehler im \"nextUpdate\"-Feld der CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Zu wenig Speicher"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Selbstsigniertes Zertifikat"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Selbstsigniertes Zertifikat in der Zertifikatkette"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Das lokale Herausgeberzertifikat ist nicht verfügbar."
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Das erste Zertifikat konnte nicht überprüft werden."
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Zertifikatkette zu lang"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Zertifikat wurde widerrufen"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Ungültiges CA-Zertifikat"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Pfadlängenbeschränkung überschritten"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Nicht unterstützter Zertifikatsverwendungszweck"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Zertifikat abgelehnt"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Betreffs-Aussteller unpassend"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Zertifizierungsstelle und Betreffsschlüssel unpassend"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Zertifizierungsstelle und Aussteller-Seriennummer unpassend"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 "Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des "
 "Zertifikats."
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen der Anwendung"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Der Server %(name)s beantwortete die Registrierungsanfrage nicht korrekt: %"
 "(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Der Server %s hat ein anderes Registrierungsformular angeboten"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Der Transport %(name)s beantwortete die Registrierungsanfrage nicht korrekt: "
 "%(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr ""
 "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Absender: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Die Verbindung zum Konto %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "Die Verbindung zum Konto \"%s\" wurde unterbrochen. Sie wird "
 "wiederhergestellt."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Die Authentizität des %s Zertifikats könnte ungültig sein."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4726,7 +4743,7 @@ msgstr ""
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4735,24 +4752,24 @@ msgstr ""
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Fehler beim Entfernen der Privatsphären-Liste"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4762,21 +4779,21 @@ msgstr ""
 "in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
 "es erneut."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 "Die Nachricht kann nicht an %s gesendet werden. Die Jabber-ID ist ungültig."
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 "Weder ist die entfernte Präsenz signiert, noch wurde ein Schlüssel "
 "zugewiesen."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4785,12 +4802,12 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4799,30 +4816,45 @@ msgstr ""
 "Thema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Kontakte einladen"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt, da der Status auf Unsichtbar gesetzt ist"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Registrierung ist fehlgeschlagen"
+
+# FIXME: Type in original string. Should be
+# Registration with agent ...
+# FIXME: Check English: should be consistently called "transport"
+#: ../src/common/connection.py:1983
+#, fuzzy, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+"Registrierung mit Transport %(agent)s ist mit Fehler %(error)s "
+"fehlgeschlagen: %(error_msg)s"
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Beobachter"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transporte"
 
@@ -4831,14 +4863,19 @@ msgid "Not in roster"
 msgstr "Nicht in der Kontaktliste"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Auf diesem Computer fehlen die Python-Bibliotheken für D-Bus."
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Die D-Bus-Fähigkeiten können nicht genutzt werden."
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (auch python-pysqlite2 genannt) fehlt. Abbruch …"
@@ -4915,56 +4952,69 @@ msgid "eleven"
 msgstr "Elf"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "fünf nach %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "zehn nach %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "viertel nach %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "zwanzig nach %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "twenty five past %(0)s"
 msgstr "fünf vor halb %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, fuzzy, python-format
 msgid "half past %(0)s"
 msgstr "halb %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "fünf nach halb %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "zwanzig vor %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "viertel vor %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "zehn vor %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "fünf vor %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s"
 
@@ -5032,224 +5082,224 @@ msgstr "Ungültiges Zeichen im Rechnernamen."
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in der Ressource."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Angemeldet"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?Kontakt hat Status: Unbekannt"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?Kontakt hat Status: Hat einen Fehler"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Abonnement schon vorhanden:Keines"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Frage nach Abonnement: Keine"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppenchat Kontaktrolle: Keine"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppenchat Kontaktverbindung:Keine"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "schreibt im Moment …"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "macht gerade eine Schreibpause"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s kB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr "Vom Chatraum %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
-msgstr "Vom Benutzer %s"
+msgstr " vom Benutzer %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr "Von %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d neues Ereignis"
 msgstr[1] "%d neue Ereignisse"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Fehler beim Ausführen von \"%(command)s\": %(error)s"
@@ -5265,11 +5315,11 @@ msgstr "%s ist kein gültiger Loglevel."
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "migriere Logdatenbank zu Indizes"
 
@@ -5919,7 +5969,7 @@ msgid ""
 msgstr "Möglicherweise läuft Gajim bereits. Dateiübertragung wird abgebrochen."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5927,7 +5977,7 @@ msgstr ""
 "[Dies ist ein Teil einer verschlüsselten Unterhaltung. Wenn Sie diese "
 "Nachricht sehen, ist etwas schief gegangen.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5936,17 +5986,31 @@ msgstr ""
 "Der Server %s, den Sie für die erweiterte Option ft_override_host_to_send "
 "angeben haben, ist ungültig und wird ignoriert."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+# TODO: GPG/PGP unification in original strings needed
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Keine OpenPGP-Passphrase gewählt."
+
+# TODO: GPG/PGP unification in original strings needed
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Um weiterhin Nachrichten senden und empfangen zu können, müssen Sie sich "
 "erneut verbinden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahi-Fehler"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5955,31 +6019,31 @@ msgstr ""
 "%s\n"
 "Lokaler Nachrichtenversand funktioniert eventuell nicht richtig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bitte überprüfen Sie, ob Avahi bzw. Bonjour installiert ist."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Lokaler Dienst konnte nicht gestartet werden"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Die Verbindung mit Port %d ist fehlgeschlagen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Bitte überprüfen Sie, ob avahi-daemon läuft."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Der Status des Kontos \"%s\" konnte nicht geändert werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5988,20 +6052,20 @@ msgstr ""
 "konnte nicht versendet werden."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Die Nachricht konnte nicht gesendet werden."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Der Kontakt ist offline. Ihre Nachricht konnte nicht gesendet werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6014,24 +6078,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Standard-Nachricht"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Kein Wörterburch für die Sprache %s verfügbar"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6040,73 +6104,73 @@ msgstr ""
 "Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
 "um die Rechtschreibprüfung nutzen zu können."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "Statusnachricht"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Jetzt erneut anmelden?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich erneut "
 "anmelden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden."
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse anzeigen, bevor das Konto entfernt wird."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Sie haben mit dem Konto %s einen Chat geöffnet."
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden."
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 "Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Damit der Kontoname geändert werden kann, müssen Sie zuvor alle neuen "
 "Ereignisse lesen."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Der Kontoname wird bereits verwendet."
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6114,148 +6178,155 @@ msgstr ""
 "Dieser Name wird bereits für eines Ihrer Konten verwendet. Bitte wählen Sie "
 "einen anderen Namen."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Der Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Der Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Konto umbenennen"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Geben Sie einen neuen Namen für das Konto %s ein"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Die Jabber-ID muss in der Form \"benutzer@servername\" sein."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Die geheimen Schlüssel konnten nicht empfangen werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Es gab ein Problem beim Empfangen Ihres geheimen OpenPGP-Schlüssels."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP-Schlüssel-Auswahl"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Das angegebene Konto ist nicht verfügbar"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie die persönlichen Informationen "
 "ändern können."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden."
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Sie müssen angemeldet sein, um Ihre persönlichen Informationen ändern zu "
 "können."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt keine vCard."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr ""
+"Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte "
 "aktivieren."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Mitgliederliste"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Besitzerliste"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "Jabber-ID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Verbannen …"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6263,11 +6334,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Mitglied hinzufügen …"
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6275,11 +6346,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Besitzer hinzufügen …"
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6287,11 +6358,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Administrator hinzufügen …"
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6299,7 +6370,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6317,128 +6388,127 @@ msgstr ""
 "benutzer@servername, jeder servername/Ressource oder jede Adresse, die eine "
 "Subdomain enthält)."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Bitte geben Sie Ihr Passwort für %s ein"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Das Konto \"%s\" ist mit dem Server verbunden"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 # TODO: make decisision about how to handle original string referring to a bookmarked groupchat.
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Dieser gespeicherte Chatraum beinhaltet ungültige Daten"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Bitte Server- und Chatraumfeld ausfüllen oder gespeicherten Chatraum löschen."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Spitzname nicht erlaubt: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Konto wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Sie können die erweiterten Kontooptionen über die Schaltfläche \"Erweitert\" "
 "oder den Konto-Menüpunktes im Menü \"Bearbeiten\" des Hauptfensters "
 "erreichen."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Bitte geben Sie den Server an, bei dem Sie sich registrieren möchten."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Zertifikat bereits in der Datei"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dieses Zertifikat wird nicht erneut hinzugefügt, da es sich bereit in der "
 "Datei %s befindet."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6453,7 +6523,7 @@ msgstr ""
 "SSL-Fehler: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6464,63 +6534,63 @@ msgstr ""
 "SHA1-Fingerprint dieses Zertifikates:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Der Kontoname ist bereits vergeben"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Nächste empfangene Nachricht ausgewählt"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Nächste empfangene Nachricht nicht ausgewählt"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Hervorhebung von Chatraum-Nachrichten"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Chatraum-Nachricht empfangen"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "E-Mail über Google-Mail empfangen"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6530,7 +6600,7 @@ msgstr ""
 "am anderen Ende eingetroffen ist. Falls es längere\n"
 "Zeit bleibt, ging die Nachricht höchstwahrscheinlich verloren."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6538,76 +6608,76 @@ msgstr ""
 "Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in "
 "diesem Chatraum gesagt wurde."
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Beenden"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Im Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In der URL für die Websuche fehlt ein \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Im _Internet hiernach suchen"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "Vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Die Jabber-ID steht bereits in der Liste"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 "Die eingegebene Jabber-ID ist bereits in der Liste. Wählen Sie bitte eine "
 "andere."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "neu@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "neu%d@jabber.id"
@@ -6642,121 +6712,121 @@ msgstr "Name des Kontakts"
 msgid "Set Mood"
 msgstr "Stimmung setzen"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusnachricht"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Statusnachricht"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Statusnachricht überschreiben"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Dieser Name wird bereits verwendet. Möchten Sie die Statusnachricht "
 "überschreiben?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Als Vorlage für Statusnachrichten speichern"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG-Nummer"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo-Adresse"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bitte füllen Sie die Daten für den Kontakt aus, den Sie dem Konto %s "
 "hinzufügen wollen"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bitte geben Sie die Daten des neuen Kontakts ein"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer-ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine Ressource enthalten."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakt bereits in der Kontaktliste"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Ein Jabber-Client in GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Zuletzt möchten wird gerne allen Paket-Verwaltern danken."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
@@ -6766,7 +6836,7 @@ msgstr ""
 "Nico Gulden (cilugnedon AT gmx.de)\n"
 "Niklas Hambüchen (nh2 AT deditus.de)"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6779,89 +6849,99 @@ msgstr ""
 "\n"
 "Falsch geschriebene Wörter können nicht hervorgehoben werden."
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Die Jabber-ID enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnement-Anfrage für das Konto %(account)s von %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anfrage von %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Sie sind bereits im Chatraum %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Sie können einen Chatraum erst betreten, wenn Sie verbunden sind."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Chatraum betreten mit dem Konto %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Ungültiger Kontoname"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Das Konto, mit dem Sie den Chatraum betreten möchten"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Ungültige Jabber-ID für den Chatraum"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Dies ist kein Chatraum"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ist nicht der Name eines Chatraums."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sie müssen verbunden sein, um Ihre Kontakte synchronisieren zu können."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Das Konto \"%s\" ist nicht mit dem Server verbunden"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Konto %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6870,302 +6950,302 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort ändern zu können."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Dateiübertragungsfehler"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Dateiübertragung beendet"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Von %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-Konsole für %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML-Konsole"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Ich würde Dich gerne zu meiner Kontaktliste hinzufügen."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr ""
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Launisch"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber-ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Gruppe"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatsphären-Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Sortierung: %(order)s, Aktion: %(action)s, Typ: %(type)s, Wert: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sortierung: %(order)s, Aktion: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Privatsphären-Listen"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 "Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
 "können."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Sie wurden in einen Chatraum eingeladen"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact hat Sie in den Chatraum %(room_Jabber-ID)s eingeladen"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact hat Sie in den Chatraum %(room_jid)s eingeladen"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Möchten Sie die Einladung annehmen?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav-Dateien"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "Nr."
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "wenn Ich bin "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7177,19 +7257,19 @@ msgstr ""
 "Der kurze Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>%(sas)"
 "s</b>"
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Sie haben die Identität dieses Kontaktes bereits überprüft."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Kontaktidentität wurde überprüft"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Erneut überprüfen …"
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7199,19 +7279,19 @@ msgstr ""
 "Nachrichten lesen oder Ihnen Nachrichten senden kann, müssen Sie seine "
 "Identität überprüfen, indem Sie die Schaltfläche weiter unten betätigen."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktidentität nicht überprüft"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Überprüfen …"
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Haben Sie die Identität des Kontaktes überprüft?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7227,13 +7307,13 @@ msgstr ""
 "Der kurze Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</"
 "b>"
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 "Haben Sie mit dem Kontakt gesprochen, um den kurzen Authentifizierungs-"
 "Schluessel zu überprüfen?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
@@ -7241,14 +7321,14 @@ msgstr ""
 "Schlüssel überein."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht "
 "verschlüsselt werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7259,7 +7339,7 @@ msgstr ""
 "einzustufen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7356,20 +7436,20 @@ msgstr "Beschreibung"
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Chatraum ist bereits gespeichert"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Chatraum wurde erfolgreich gespeichert"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Sie können die gespeicherten Chaträume über das Aktionen-Menü in der "
@@ -7383,15 +7463,15 @@ msgstr "Abonniert"
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Neue Nachricht"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
@@ -7847,31 +7927,31 @@ msgstr "Gajim benötigt einen laufenden X-Server. Abbruch …"
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim benötigt PyGTK 2.6 oder höher"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim benötigt PyGTK 2.6 oder höher. Abbruch …"
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim benötigt GTK 2.6 oder höher"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim benötigt GTK 2.6+. Abbruch …"
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Der GTK+-Laufzeitumgebung fehlt die libglade-Unterstützung"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7880,22 +7960,22 @@ msgstr ""
 "Bitte entfernen Sie Ihre derzeitige GTK+-Laufzeitumgebung und installieren "
 "Sie die aktuelle Version von %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Bitte stellen Sie sicher, dass die auf Ihrem Computer verwendeten Versionen "
 "von GTK+ und PyGTK libglade-Unterstützung besitzen."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim benötigt PySQLite2 zum Starten"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim benötigt pywin32 zum Laufen"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7905,11 +7985,11 @@ msgstr ""
 "können es unter folgender URL herunterladen: %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim läuft bereits"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7917,12 +7997,12 @@ msgstr ""
 "Gajim schein bereits zu laufen.\n"
 "Soll eine weitere Instanz gestartet werden?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
@@ -7930,30 +8010,30 @@ msgstr ""
 "(account)s)."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Kein GPG-Schlüssel zugewiesen"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
 "Abbrechen."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7964,58 +8044,58 @@ msgstr ""
 "von einem anderen Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Akzeptieren Sie diese Anfrage vom Konto %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisierung für %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fehler %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 msgid "Subscription request"
 msgstr "Abonnementanfrage"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" hat Sie autorisiert, seinen Status zu sehen."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8023,79 +8103,79 @@ msgstr ""
 "Er wird Ihnen von nun an als offline angezeigt.\n"
 "Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s heißt jetzt %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s hat das Thema in %(subject)s geändert"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Eine nicht Privatsphären-bezogene Chatraum-Konfigurations-Änderung ist "
 "aufgetreten"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Der Chatraum ist jetzt nicht mehr anonym"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Der Chatraum ist jetzt semi-anonym"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Der Chatraum ist jetzt komplett anonym"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Für das Betreten des Chatraumes %s wird ein Passwort benötigt."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8104,22 +8184,27 @@ msgstr ""
 "jedoch kein GPG-Agent oder er gab eine falsche Passphrase zurück.\n"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne Ihren GPG-Schlüssel verbunden"
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Ihre Passphrase ist falsch"
+
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG ist nicht benutzbar"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -8128,13 +8213,14 @@ msgstr ""
 "Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht "
 "verschlüsselt werden."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
@@ -8143,19 +8229,19 @@ msgstr ""
 "gestartet (die Umgebungsvariablen sind möglicherweise nicht \t\t\t\t\t\t"
 "\tkorrekt gesetzt gesetzt)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Neue E-Mail über %(gmail_mail_address)s empfangen"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Sie haben %d ungelesene E-Mail"
 msgstr[1] "Sie haben %d ungelesene E-Mails"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8170,45 +8256,45 @@ msgstr ""
 "Betreff: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte Ihnen eine Datei senden."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Entfernt den Kontakt aus der Kontaktliste"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Die Übermittlung der Datei %(filename)s von %(name)s war erfolgreich."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Sie haben die Datei %(filename)s erfolgreich an %(name)s gesendet."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Die Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8217,36 +8303,36 @@ msgstr ""
 "Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
 "Eventuell wurde sie verändert."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Die Nachricht konnte nicht entschlüsselt werden"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Fehler:"
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8254,11 +8340,11 @@ msgstr ""
 "Sie sind mit diesem Konto bereits mit derselben Ressource verbunden. Bitte "
 "geben Sie eine neue Ressource ein"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8269,17 +8355,17 @@ msgstr ""
 "Servers auf: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriere den Fehler für dieses Zertifikat."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "SSL-Zertifikat-Fehler"
 
 # FIXME: Check English. Should be:
 # your connection has been hacked.
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8297,11 +8383,11 @@ msgstr ""
 "Möchten Sie sich dennoch verbinden und den Fingerabdruck des Zertifikats "
 "aktualisieren?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8309,11 +8395,11 @@ msgstr ""
 "Sie sind dabei, Ihr Passwort über eine nicht verschlüsselte Verbindung zu "
 "senden. Sind Sie sicher, dass Sie dies tun möchten?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8322,21 +8408,21 @@ msgstr ""
 "Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
 "installieren, um dieses Problem zu beheben.)"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "PEP-Knoten wurde nicht entfernt"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Der PEP-Knoten %(node)s wurde nicht entfernt: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Emoticons deaktiviert"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8344,7 +8430,7 @@ msgstr ""
 "Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind "
 "deaktiviert."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8354,13 +8440,13 @@ msgstr ""
 "eventuell das Format der Datei emoticons.py aktualisieren. Besuchen Sie "
 "http://trac.gajim.org/wiki/Emoticons (Englisch) für mehr Informationen."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Sie können einen Chatraum nicht betreten, wenn Sie unsichtbar sind."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
@@ -8393,12 +8479,13 @@ msgstr ""
 "Gibt eine Liste aller Kontakte in der Kontaktliste aus. Eine Zeile je Kontakt"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "Konto"
 
@@ -8423,9 +8510,9 @@ msgstr "Status"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "Mögliche Werte: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "Nachricht"
 
@@ -8443,24 +8530,49 @@ msgstr ""
 "synchronisieren\" aktiviert ist"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Ändert den Status eines oder mehrerer Konten"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_tät:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Ich möchte ein neues Konto _erstellen"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"Ändere Status des Kontos \"account\". Falls nicht angegeben, ändere Status "
+"aller Konten für die die Option \"Kontostatus mit globalem Status "
+"synchronisieren\" aktiviert ist"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Zeige Chatfenster, sodass eine Nachricht an einen Kontakt gesendet werden "
 "kann"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "Jabber-ID des Kontakts, mit dem Sie chatten möchten"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "falls angegeben, wird der Kontakt von der Liste dieses Kontos gewählt"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8470,30 +8582,30 @@ msgstr ""
 "Schlüssel und Konto sind optional. Falls nur das Konto ohne einen OpenGPG-"
 "Schlüssel gesetzt werden soll, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "Jabber-ID des Kontakts, der die Nachricht empfangen soll"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "PGP-Schlüssel"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "falls angegeben, wird die Nachricht damit verschlüsselt"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8503,139 +8615,139 @@ msgstr ""
 "Schlüssel und Konto sind optional. Falls nur das Konto ohne einen OpenGPG-"
 "Schlüssel gesetzt werden soll, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "Betreff"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "Nachrichten-Betreff"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sendet eine neue Nachricht an einen Chatraum, den Sie betreten haben."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "Jabber-ID des Chatraums, der die Nachricht empfangen soll"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Zeige detaillierte Informationen über einen Kontakt"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Jabber-ID des Kontakts"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über ein Konto"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Name des Kontos"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "Datei"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Dateipfad"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "Wenn angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Zeigt alle Einstellungen und ihre Werte"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setzt den Wert von 'Schlüssel' auf 'Wert'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'Schlüssel' ist der Name der Einstellung, 'Wert' ist der der einzustellende "
 "Wert"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Löscht eine Einstellung"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "Schlüssel"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Schreibt die aktuellen Gajim-Einstellungen in die Konfigurationsdatei"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus der Kontaktliste"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Fügt den Kontakt der Kontaktliste hinzu"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "Jabber-ID"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Fügt einen neuen Kontakt zu diesem Konto hinzu"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Gibt den derzeitigen Status zurück (den globalen Status, es sei denn, es "
 "wird ein Konto angegeben)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Gibt die derzeitige Statusnachricht zurück (die globale, es sei denn, es "
 "wird ein Konto angegeben)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Gibt die Anzahl der ungelesenen Nachrichten zurück"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Öffnet den Dialog zum Beginnen eines Chats"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Startet einen Chat über dieses Konto"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Benutzerdefinierten XML-Code senden"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "Zu sendender XML-Code"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8643,72 +8755,72 @@ msgstr ""
 "Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
 "der XML-Code an alle Konten gesendet"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Verarbeite einen xmpp:/-URI"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "Zu verarbeitender URI"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Konto, mit dem er verarbeitet werden soll"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "Nachrichteninhalt"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Neuen Chatraum betreten"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "Chatraum"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "Jabber-ID des Chatraums"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "Spitzname"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Spitzname, der benutzt werden soll"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "Passwort"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Das Passwort, um den Chatraum zu betreten"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Das Konto, mit dem Sie den Chatraum betreten möchten"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Bitte überprüfen Sie, ob Gajim läuft"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_Jabber-ID\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8717,17 +8829,17 @@ msgstr ""
 "'%s' ist nicht in Ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Gajim scheint nicht gestartet zu sein, daher kann gajim-remote nicht genutzt "
 "werden."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8736,16 +8848,16 @@ msgstr ""
 "Verwendung: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8754,7 +8866,7 @@ msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Der Befehl ist einer von:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8764,7 +8876,7 @@ msgstr ""
 "Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
 "erhalten"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8774,7 +8886,7 @@ msgstr ""
 "Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
 "erhalten"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Falscher URI"
 
@@ -8804,302 +8916,157 @@ msgid "Please first choose another for your current theme."
 msgstr ""
 "Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Entweder sind Sie nicht mehr im Chatraum \"%(room)s\" oder \"%(nick)s\" hat "
 "den Chatraum verlassen."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Unterhaltung mit "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Chatraum-Aufzeichnung ist aktiviert"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Ein neuer Chatraum wurde erstellt"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Der Server hat Ihren Chatraum-Nick zugewiesen oder verändert"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr ""
 "%(nick)s wurde von %(who)s aus dem Chatraum geworfen. Grund: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "Zugehörigkeit geändert:"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 "Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "Computer wird heruntergefahren"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Mitgliedschaft von %(nick)s wurde von %(actor)s auf %(affiliation)s "
 "gesetzt"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Mitgliedschaft von %(nick)s wurde an %(affiliation)s gesendet"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Die Rolle von %(nick)s wurde durch %(actor)s in %(role)s geändert"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Die Rolle von %(nick)s wurde in %(role)s geändert"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Chatraum betreten"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Spitzname nicht gefunden: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Dieser Chatraum hat kein Thema"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Spitzname nicht gefunden: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Verwendung: /%s <Spitzname|Jabber-ID> [Grund], verbannt die Jabber-ID aus "
-"dem Chatraum. Der Spitzname eines Teilnehmers kann hinzugefügt werden, wenn "
-"er kein \"@\" enthält. Wenn die Jabber-ID derzeit im Chatraum ist, wird sie "
-"zusätzlich herausgeworfen. Leerzeichen im Spitznamen werden nicht "
-"unterstützt."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit dem "
-"Inhaber des angegebenen Spitznamens."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Verwendung: /%s [Grund], schließt das aktuelle Fenster oder den aktuellen "
-"Tab, optional mit der Angabe eines Grundes."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Verwendung: /%s <Jabber-ID> [Grund], lädt die Jabber-ID in den aktuellen "
-"Chatraum ein, optional mit der Angabe eines Grundes."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Verwendung: /%s <Chatraum>@<Server> [/Spitzname], bietet den Beitritt zu "
-"Chatraum@Server an, optional mit Spitznamen."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Verwendung: /%s <Spitzname> [Grund], entfernt den Inhaber des angegebenen "
-"Spitznamens aus dem Chatraum, optional mit Grund. Leerzeichen im Spitznamen "
-"werden nicht unterstützt."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Verwendung: /%s <Spitzname> [Nachricht], öffnet ein privates "
-"Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
-"Spitznamens."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Verwendung: /%s, zeigt die Namen der Teilnehmer im Chatraum an."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Verwendung: /%s [topic], zeigt oder aktualisiert das derzeitige Chatraum-"
-"Thema."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Verwendung: /%s <Nachricht>, sendet eine Nachricht, ohne andere Befehle zu "
-"beachten."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Möchten Sie den Chatraum \"%s\" wirklich verlassen?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Chatraum "
 "geschlossen."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Bitte wählen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Lösche %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9107,22 +9074,22 @@ msgstr ""
 "Der Chatraum wird endgültig gelöscht.\n"
 "Sie können hier einen Grund angeben:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Sie können auch einen alternativen Chatraum eintragen:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rauswerfen"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -9199,6 +9166,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Bild speichern unter …"
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "Neuer Gruppenchat"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Kann Verlaufs-Datenkbank nicht finden"
@@ -9281,52 +9256,62 @@ msgstr "Unterhaltungs-Verlauf mit %s"
 msgid "Disk Error"
 msgstr "Festplattenfehler"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ist jezt %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Fehlermeldung: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Fehler:"
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Der Status ist jetzt: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Der Status ist jetzt: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Das Bild ist zu groß"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Sie sind nicht mit dem Server verbunden."
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Chatraum"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Nachrichten"
 
@@ -9386,18 +9371,18 @@ msgstr "Ignorieren"
 msgid "Retrieving profile..."
 msgstr "Empfange Profil …"
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Datei ist leer"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Datei existiert nicht"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
@@ -9431,48 +9416,48 @@ msgstr ""
 "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
 "aufgetreten. Versuchen Sie es später erneut."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt Ihren Status."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Wenn \"%s\" diese Anfrage akzeptiert, können Sie seinen/ihren Status sehen."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG ist nicht benutzbar"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9480,28 +9465,28 @@ msgstr ""
 "Wenn Sie Ihren Status auf unsichtbar setzen, werden Sie von diesen "
 "Chaträumen getrennt. Sind Sie sicher, dass Sie unsichtbar werden möchten?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "Nicht synchronisiert"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Möchten Sie den Chatraum \"%s\" wirklich verlassen?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9509,16 +9494,16 @@ msgstr ""
 "Nachrichten sind nur für das spätere Lesen verfügbar, wenn der Verlauf "
 "aktiviert wurde und der Kontakt sich in der Kontaktliste befindet."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Sie müssen sie lesen, bevor das Konto entfernt wird."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Der Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9526,11 +9511,11 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diesen Transport "
 "austauschen."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9539,58 +9524,71 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diese Transporte "
 "austauschen: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Sie sind dabei, einen Metakontakt zu erstellen. Wollen Sie wirklich "
+"fortfahren?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Geben Sie einen Spitznamen für den Kontakt %s ein"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Geben Sie einen neuen Namen für die Gruppe %s ein"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Möchten Sie wirklich die Gruppe %s von Ihrer Kontaktliste entfernen?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Auch alle Kontakte dieser Gruppe von Ihrer Kontaktliste entfernen"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel zuweisen"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Sie sind dabei, \"%(name)s\" (%(jid)s) aus der Kontaktliste zu entfernen.\n"
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9600,11 +9598,11 @@ msgstr ""
 "offline sehen wird."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortsetzen?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9613,17 +9611,17 @@ msgstr ""
 "Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
 "offline sehen wird."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Ich möchte, dass dieser Kontakt meinen Status auch nach dem Entfernen sieht"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9633,22 +9631,37 @@ msgstr ""
 "entziehen Sie ihnen auch die Berechtigung, Ihren Status zu sehen, wodurch "
 "die Kontakte Sie nur noch als offline sehen werden."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Sie sind dabei, einen Metakontakt zu erstellen. Wollen Sie wirklich "
+"fortfahren?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden "
 "können."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9657,14 +9670,14 @@ msgstr ""
 "Daher werden diese Informationen bei der nächsten Neuverbindung nicht "
 "gespeichert."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Sie sind dabei, einen Metakontakt zu erstellen. Wollen Sie wirklich "
 "fortfahren?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9674,23 +9687,23 @@ msgstr ""
 "gruppieren. Sie werden normalerweise verwendet, wenn eine Person mehrere "
 "Jabber- oder Transport-Konten hat."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Ungültiger Datei-URI:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Wollen Sie die Datei an %s senden?"
 msgstr[1] "Wollen Sie die Dateien an %s senden?"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Sende %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Sendet dem Kontakt eine Datei"
@@ -9700,115 +9713,127 @@ msgstr "Sendet dem Kontakt eine Datei"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "über das Konto %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "an das Konto %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "über das Konto %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Gespeicherte Chaträume …"
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "des Kontos %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "für das Konto %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Dienste konfigurieren …"
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Nachricht an die Gruppe _senden"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "An alle Benutzer"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "Kontakte verwalten"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "_Gruppen bearbeiten"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Befehl ausführen …"
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Transport verwalten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Ändern"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Umbenennen"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Verbindung trennen"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "Neuer Gruppenchat"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Verbindung trennen"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Chatraum betreten …"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht …"
 
@@ -9825,20 +9850,20 @@ msgstr "Fehler im empfangenen Datenformular"
 msgid "No result"
 msgstr "Kein Ergebnis"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Thema: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Bestätigen Sie diese Sitzungsoptionen"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9853,7 +9878,7 @@ msgstr ""
 "\n"
 "\t\tSind diese Einstellungen akzeptabel?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10048,6 +10073,141 @@ msgstr "Es gibt keine offenen Abonnementanfragen."
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Spezielle Be_nachrichtigung hinzufügen"
+
+# TODO: GPG/PGP unification in original strings needed
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Open_PGP-Schlüssel zuweisen"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Der Befehl für das Zeroconf-Konto wird nicht unterstützt."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Befehle: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Verwendung: /%s, leert das Textfenster."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Verwendung: /%s, versteckt die Chatschaltflächen."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Verwendung: /%(command)s <Aktion>, sendet eine Aktion an den aktuellen "
+#~ "Chatraum. Verwenden Sie die Person Singular, z.B. mit /%(command)s kratzt "
+#~ "sich am Kinn)."
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Verwendung: /%s, sendet einen Ping zum Kontakt."
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Keine Hilfe vorhanden für /%s."
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Aktiviere Anzeige von Kontakten im LAN über Zeroconf."
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Spitzname nicht gefunden: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Dieser Chatraum hat kein Thema"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Spitzname nicht gefunden: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Verwendung: /%s <Spitzname|Jabber-ID> [Grund], verbannt die Jabber-ID aus "
+#~ "dem Chatraum. Der Spitzname eines Teilnehmers kann hinzugefügt werden, "
+#~ "wenn er kein \"@\" enthält. Wenn die Jabber-ID derzeit im Chatraum ist, "
+#~ "wird sie zusätzlich herausgeworfen. Leerzeichen im Spitznamen werden "
+#~ "nicht unterstützt."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit "
+#~ "dem Inhaber des angegebenen Spitznamens."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Verwendung: /%s [Grund], schließt das aktuelle Fenster oder den aktuellen "
+#~ "Tab, optional mit der Angabe eines Grundes."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Verwendung: /%s <Jabber-ID> [Grund], lädt die Jabber-ID in den aktuellen "
+#~ "Chatraum ein, optional mit der Angabe eines Grundes."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Verwendung: /%s <Chatraum>@<Server> [/Spitzname], bietet den Beitritt zu "
+#~ "Chatraum@Server an, optional mit Spitznamen."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Verwendung: /%s <Spitzname> [Grund], entfernt den Inhaber des angegebenen "
+#~ "Spitznamens aus dem Chatraum, optional mit Grund. Leerzeichen im "
+#~ "Spitznamen werden nicht unterstützt."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Verwendung: /%s <Spitzname> [Nachricht], öffnet ein privates "
+#~ "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
+#~ "Spitznamens."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Verwendung: /%s, zeigt die Namen der Teilnehmer im Chatraum an."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Verwendung: /%s [topic], zeigt oder aktualisiert das derzeitige Chatraum-"
+#~ "Thema."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Verwendung: /%s <Nachricht>, sendet eine Nachricht, ohne andere Befehle "
+#~ "zu beachten."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
+
 #~ msgid "B_OSH Port:"
 #~ msgstr "B_OSH-Port:"
 
diff --git a/po/el.po b/po/el.po
index 0610a8234..46043b2d2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:46+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team:  <>\n"
@@ -227,6 +227,7 @@ msgstr "<b>Προσωπικές πληροφορίες</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Λογαριασμός"
 
@@ -295,8 +296,8 @@ msgstr "Τροποποίηση προσωπικών πληροφοριών..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -307,8 +308,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Γενικά"
 
@@ -370,25 +371,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Οι πληροφορίες για εσάς, όπως αποθηκεύονται στο διακομιστή"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Δεν έχει επιλεχτεί κλειδί"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Κανένα"
 
@@ -547,8 +544,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -562,7 +559,7 @@ msgid "Mer_ge accounts"
 msgstr "Συ_γχώνευση λογαριασμών"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "_Μετονομασία"
 
@@ -830,7 +827,7 @@ msgid "All statuses"
 msgstr "Όλες οι καταστάσεις"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Απομακρυσμένος"
 
@@ -847,7 +844,7 @@ msgid "Have "
 msgstr "Έχει"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Αφανής"
 
@@ -856,7 +853,7 @@ msgid "Launch a command"
 msgstr "Εκτέλεση εντολής"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
@@ -1049,7 +1046,7 @@ msgid "Join _Group Chat"
 msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "_Προσθήκη στη λίστα επαφών"
@@ -1076,65 +1073,158 @@ msgstr "_Άνοιγμα δεσμού στον περιηγητή"
 msgid "_Start Chat"
 msgstr "_Έναρξη συζήτησης"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Αδυναμία φόρτωσης"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Παρατηρητές"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+#, fuzzy
+msgid "A_sk to see his/her status"
+msgstr "Ζήτα να βλέπεις την κατάσταση του/της"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Προσθήκη ειδικής _γνωστοποίησης"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Ανάθεση κλειδιού Open_PGP"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Αδυναμία εκτέλεσης της εντολής:"
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Επεξεργασία _ομάδων"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+#, fuzzy
+msgid "In_vite to"
+msgstr "Αδυναμία φόρτωσης"
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Επαφές"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Αφαίρεση"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Αποστολή μονού _μηνύματος"
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "Αποστολή _αρχείου"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Έναρξη _συζήτησης"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Προσθήκη στη λίστα επαφών"
+#: ../data/glade/contact_context_menu.glade.h:17
+#, fuzzy
+msgid "_Allow him/her to see my status"
+msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:19
+#, fuzzy
+msgid "_Forbid him/her to see my status"
+msgstr "Απαγόρευσε τον/την να βλέπει την κατάστασή μου"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Αδυναμία φόρτωσης"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "Παρατηρητές"
+msgid "_Manage Contact"
+msgstr "_Μετονομασία αρχείων"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Μετονομασία"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Συνδρομή"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "εννιά"
+
 #: ../data/glade/data_form_window.glade.h:1
 #, fuzzy
 msgid "Fill in the form."
@@ -1259,7 +1349,7 @@ msgstr ""
 "Επαφή\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Έντονα"
 
@@ -1283,7 +1373,7 @@ msgstr "Έξω"
 msgid "Inactive"
 msgstr "Ανενεργό"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Πλάγια"
 
@@ -1361,6 +1451,14 @@ msgstr "_Συντονιστής"
 msgid "Occupant Actions"
 msgstr "_Ενέργειες για τους συμμετέχοντες"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Αποστολή _αρχείου"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Προσθήκη στη λίστα επαφών"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Διαχειριστής"
@@ -1369,13 +1467,6 @@ msgstr "_Διαχειριστής"
 msgid "_Ban"
 msgstr "_Απαγόρευση πρόσβασης"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Ξεφορτώσου τον"
@@ -1392,13 +1483,6 @@ msgstr "_Ιδιοκτήτης"
 msgid "_Send Private Message"
 msgstr "_Αποστολή προσωπικού μηνύματος"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Φωνή"
@@ -1408,7 +1492,7 @@ msgstr "_Φωνή"
 msgid "Create new post"
 msgstr "Δημιουργία νέου προφίλ"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Από"
 
@@ -1440,8 +1524,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Διαχειριστής βάσης δεδομένων ιστορικού Gajim"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -1487,35 +1571,40 @@ msgstr "Αναζήτηση"
 msgid "_Log conversation history"
 msgstr "_Καταγραφή ιστορικού συζητήσεων"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 #, fuzzy
 msgid "Join this room automatically when I connect"
 msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Ψευδώνυμο:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Πρόσφατα:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Δωμάτιο:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Συμμετοχή"
@@ -1546,7 +1635,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Εμφάνιση κατάστασης:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Εξυπηρετητής:"
 
@@ -2098,7 +2187,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Κατάσταση"
 
@@ -2277,34 +2366,39 @@ msgid "All"
 msgstr "Όλα"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "όλους κατά συνδρομή"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Επέτρεψε"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Άρνηση"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Σειρά:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "όλους κατά συνδρομή"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "όλους στην ομάδα"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2312,22 +2406,22 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 #, fuzzy
 msgid "to send me messages"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 #, fuzzy
 msgid "to send me queries"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to send me status"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 #, fuzzy
 msgid "to view my status"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
@@ -2520,110 +2614,11 @@ msgstr "Αφαίρεση λογαριασμού από το Gajim και από
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-#, fuzzy
-msgid "A_sk to see his/her status"
-msgstr "Ζήτα να βλέπεις την κατάσταση του/της"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Προσθήκη ειδικής _γνωστοποίησης"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Ανάθεση κλειδιού Open_PGP"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "Επεξεργασία _ομάδων"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-#, fuzzy
-msgid "Execute Command..."
-msgstr "Αδυναμία εκτέλεσης της εντολής:"
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-#, fuzzy
-msgid "In_vite to"
-msgstr "Αδυναμία φόρτωσης"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Αφαίρεση"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Αποστολή μονού _μηνύματος"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "Αποστολή _αρχείου"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Έναρξη _συζήτησης"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#, fuzzy
-msgid "_Allow him/her to see my status"
-msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Forbid him/her to see my status"
-msgstr "Απαγόρευσε τον/την να βλέπει την κατάστασή μου"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "_Μετονομασία αρχείων"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Μετονομασία"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Συνδρομή"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "εννιά"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2753,7 +2748,7 @@ msgid "_Add contact"
 msgstr "Προσθήκη _επαφής"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "Πληροφορίες επαφής"
@@ -2983,26 +2978,6 @@ msgstr "_Μήνυμα"
 msgid "_Presence"
 msgstr "_Παρουσία"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Προσθήκη ειδικής _γνωστοποίησης"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Ανάθεση κλειδιού Open_PGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Επεξεργασία _ομάδων"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Μετονομασία"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Επεξεργασία λογαριασμού..."
@@ -3047,48 +3022,48 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Ενεργό"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Ανενεργό"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Ακέραιος"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Χρώμα"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Όνομα προτίμησης"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Τιμή"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Είδος"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Κενή)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Μυστικό"
 
@@ -3102,254 +3077,253 @@ msgstr "Προσθήκη νέας εγγραφής στο μενού"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Αγγλικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Βουλγαρικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Τσέχικα"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Γερμανικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Εληνικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Βρετανικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Εσπεράντο"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Ισπανικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Γαλλικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Κροατικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Ιταλικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Νορβηγικά (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Ολλανδικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Νορβηγικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Πολωνέζικα"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Πορτογαλικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Πορτογαλικά Βραζιλίας"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Ρώσικα"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Serbian"
 msgstr "Γερμανικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Σλοβάκικα"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Σουηδικά"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Κινέζικα (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Υπογράμμιση"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Ψευδώνυμο"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Γραμματοσειρά:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Χρήση πιστοποίησης"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Χρήση πιστοποίησης"
@@ -3357,102 +3331,58 @@ msgstr "Χρήση πιστοποίησης"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Εντολές: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
-"προσώπου (π.χ. /%s χοροπηδάει)."
-
-#: ../src/chat_control.py:1777
-#, fuzzy, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr ""
-"Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3460,22 +3390,22 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
@@ -3484,23 +3414,23 @@ msgstr "Ο %(nick)s είναι τώρα %(status)s"
 msgid "creating logs database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Το Gajim τώρα θα κλείσει"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "δημιουργία φακέλου %s"
@@ -3566,9 +3496,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 #, fuzzy
 msgid "Groupchats"
 msgstr "Ομαδικές συζητήσεις"
@@ -3587,54 +3517,99 @@ msgstr "%d μη αναγνωσμένο μήνυμα"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Χρήση του D-Bus και του δαίμονα ειδοποιήσεων για εμφάνιση ειδοποιήσεων"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε "
 "απομακρυσμένος."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Απομακρυσμένος λόγω αδράνειας"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε μη "
 "διαθέσιμος."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "κείμενο μηνύματος κατάστασης"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Αλλαγή ψευδωνύμου"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "κείμενο μηνύματος κατάστασης"
+
+#: ../src/common/config.py:105
 #, fuzzy
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
@@ -3643,85 +3618,81 @@ msgstr ""
 "συμπτυχθεί"
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "Προεπιλογή"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Τα ζεύγη * / _ είναι χαρακτήρες μορφοποίησης."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα "
 "* * δεν θα αφαιρεθούν."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3729,12 +3700,26 @@ msgstr ""
 "Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα "
 "ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Πόσα λεπτά θα παραμείνουν οι τελευταίες γραμμές από την προηγούμενη συζήτηση."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3742,11 +3727,11 @@ msgstr ""
 "Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ "
 "ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3755,13 +3740,13 @@ msgstr ""
 "Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή "
 "'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγχθεί από μακριά χρησιμοποιόντας "
 "το gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3769,28 +3754,28 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
@@ -3799,7 +3784,7 @@ msgstr ""
 "Να γίνεται πάντα ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
@@ -3808,13 +3793,13 @@ msgstr ""
 "Να μην γίνεται ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3823,28 +3808,28 @@ msgstr ""
 "Προέχει του κεντρικού υπολογιστή που αποστέλουμε για Μεταφορές Αρχείων σε "
 "περίπτωση που υπάρχει μετάφραση διεύθυνσης/προώθηση πόρτας."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3852,19 +3837,19 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3873,13 +3858,13 @@ msgstr ""
 "παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
 "στην μπάρα ειδοποιήσεων."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Αν είναι αληθές, το Gajim καταχωρείται στο xmpp:// σε κάθε έναρξη του."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3888,7 +3873,7 @@ msgstr ""
 "έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει "
 "κίνηση."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -3897,11 +3882,11 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
 "είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3909,7 +3894,7 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα κοιτάει αν κάθε επαφή που δεν είχε ως τώρα "
 "άβαταρ, έχει τώρα ή έχει αλλά είναι πεπαλαιωμένη."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3919,7 +3904,7 @@ msgstr ""
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα "
 "κατάστασης."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3928,28 +3913,28 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3958,7 +3943,7 @@ msgstr ""
 "Αν είναι ενεργοποιημένο, και τα GTK+ και PyGTK είναι έκδοσης 2.8 και πάνω, "
 "να αναβοσβήνει το παράθυρο όταν υπάρχουν εκκρεμή γεγονότα."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -3969,7 +3954,7 @@ msgstr ""
 "δωμάτιο προστατευμένο με συνθηματικό. Απενεργοποιήστε αυτή την επιλογή"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3988,51 +3973,51 @@ msgstr ""
 "'pertype' - Κάθε τύπος μηνύματος έχει το δικό του παράθυρο. Αυτή η επιλογή "
 "απαιτεί επανεκκίνηση του gajim για να εφαρμοστεί."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Αν Αληθές, πατώντας το πλήκτρο διαφυγής, κλείνει η καρτέλα/το παράθυρο."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Αποκρύπτει την κεφαλίδα στο παράθυρο προσωπικής κουβέντας"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Αποκρύπτει τη λίστα συμμετεχόντων στο παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4040,165 +4025,198 @@ msgid ""
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Ειδική παράκαμψη για το jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4207,126 +4225,126 @@ msgstr ""
 "διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
 "αρχείων."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'ναι', 'όχι', ή 'και τα δύο'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'ναι', 'όχι' ή ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Είμαι διαθέσιμος."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Είμαι ελεύθερος για κουβέντα."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Δεν είμαι διαθέσιμος."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Μην ενοχλείτε."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Γεια χαρά!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4335,180 +4353,187 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "πράσινο"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "ζεστό"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "θαλασσί"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Λάθος διακομιστής"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
 "%s"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Δεν είστε στη λίστα μελών."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4518,284 +4543,270 @@ msgstr ""
 "σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
 "jabberstudio.org για να το αφαιρέσετε"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Δε δόθηκε φράση πρόσβασης για το OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Επανασύνδεση χειροκίνητα."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Μη έγκυρη απόκριση"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Aυτό το μήνυμα είναι *κρυπτογραφημένο* (Δείτε:JEP:`27`)]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4804,30 +4815,40 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Επαφές"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr ""
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Η δημοσιοποίηση της vCard απέτυχε"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Παρατηρητές"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Μεταφορές"
 
@@ -4837,14 +4858,19 @@ msgid "Not in roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Δεν υπάρχει υποστήριξη D-Bus για την python σε αυτόν τον υπολογιστή"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Οι δυνατότητες του Gajim για D-Bus δε θα χρησιμοποιηθούν"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "Δεν βρέθηκε το pysqlite2 (ή python-pysqlite2). Έξοδος..."
@@ -4923,56 +4949,69 @@ msgid "eleven"
 msgstr "έντεκα"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s ακριβώς"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s και πέντε"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s και δέκα"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s και τέταρτο"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s και είκοσι"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s και εικοσιπέντε"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s και μισή"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "%(1)s παρά εικοσιπέντε"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "%(1)s παρά είκοσι"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "%(1)s παρά τέταρτο"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "%(1)s παρά δέκα"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "%(1)s παρά πέντε"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s ακριβώς"
 
@@ -5040,225 +5079,225 @@ msgstr "Μη έγκυρος χαρακτήρας στο όνομα του δια
 msgid "Invalid character in resource."
 msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _κουβέντα"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Διαθέσιμος"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Διαθέσιμος"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "Αόρατ_ος"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?κατάσταση επαφής: Άγνωστη"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Καμία"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Προς"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Τίποτα"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Ιδιοκτήτης"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Μέλος"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "γράφει ένα μήνυμα..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Αποστολή μηνύματος"
 msgstr[1] "Αποστολή μηνύματος"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5274,11 +5313,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "κυανό"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
@@ -6004,82 +6043,94 @@ msgid ""
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Δε δόθηκε φράση πρόσβασης για το OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
 "επανασυνδεθείτε."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Σφάλμα avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Δεν ήταν δυνατή η εκκίνηση της τοπικής υπηρεσίας"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr ""
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6090,100 +6141,100 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Νέα είσοδος τώρα;"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Αδιάβαστα γεγονότα"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή "
 "γεγονότα."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6191,148 +6242,154 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "Διαχείριση λογαριασμών"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Σφάλμα κατά τη λήψη των μυστικών κλειδιών OpenPGP σας."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το κλειδί OpenPGP σας"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Λίστα Ban"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Λίστα μελών"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Ρόλος"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6340,11 +6397,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6352,11 +6409,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6365,11 +6422,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6377,7 +6434,7 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6394,61 +6451,61 @@ msgstr ""
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Είσοδος και έξοδος μόνο"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6456,73 +6513,71 @@ msgstr ""
 "αφαιρέστε το σελιδοδείκτη."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Μπορείτε να αλλάξετε τις προχωρημένες επιλογές για το λογαριασμό σας "
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6532,7 +6587,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6540,74 +6595,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Ενεργό"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Λήφθηκε το πρώτο μήνυμα"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Επισήμανση "
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6616,76 +6671,76 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Έξοδος"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Α_ναζήτηση για:"
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Λείπει ένα \"%s\" από το URL του λεξικού και δεν είναι WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Χθες"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "πριν από %i μέρες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Ένα πρόγραμμα για το Jabber"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6721,21 +6776,21 @@ msgstr "Όνομα επαφής"
 msgid "Set Mood"
 msgstr "Ορισμός MOTD"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για κατάσταση %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6743,108 +6798,108 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Αποθήκευση ως προκαθορισμένο μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Εισάγετε ένα όνομα για αυτό το μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 #, fuzzy
 msgid "AIM Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 #, fuzzy
 msgid "GG Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 #, fuzzy
 msgid "ICQ Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 #, fuzzy
 msgid "MSN Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στο "
 "λογαριασμό %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να περιέχει έναν πόρο."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 #, fuzzy
 msgid "User ID:"
 msgstr "Το αναγνωριστικό χρήστη δεν ταιριάζει"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Έκδοση GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Έκδοση PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Δημιουργοί:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "ΕΥΧΑΡΙΣΤΙΕΣ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Τέλος, θα θέλαμε να ευχαριστήσουμε όλους τους διαχειριστές πακέτων."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
@@ -6852,7 +6907,7 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg@hellug.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6861,102 +6916,114 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Αίτηση εγγραφής για το λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Μη έγκυρο όνομα λογαριασμού"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr ""
+"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
+"άλλες επαφές."
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 #, fuzzy
 msgid "This is not a group chat"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναρξη κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6966,304 +7033,304 @@ msgstr ""
 "την οποία θέλετε να στείλετε ένα μήνυμα συζήτησης:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Μη έγκυρο JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Δεν ήταν δυνατή η ανάγνωση του \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Νέο μήνυμα"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Νέο μονό μήνυμα"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Η επαφή άλλαξε κατάσταση"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Από %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Ομάδα"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, fuzzy, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "backdrops.list"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, fuzzy, python-format
 msgid "Privacy List for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Εικονίδια δράσεων"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Επεξεργασία κανόνα</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, fuzzy, python-format
 msgid "Privacy Lists for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Επιλογή ήχου"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Όταν το %s γίνεται:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Κατάσταση"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "όταν είμαι"
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7271,38 +7338,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7312,26 +7379,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7427,20 +7494,20 @@ msgstr "Περιγραφή"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
@@ -7454,16 +7521,16 @@ msgstr "Εγγεγραμμένος"
 msgid "Node"
 msgstr "Κόμβος"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 #, fuzzy
 msgid "New post"
 msgstr "_Νέα λίστα..."
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Εγγραφή"
@@ -7907,31 +7974,31 @@ msgstr "Το Gajim απαιτεί Xserver για να εκτελεστεί. Έξ
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Η libglade λείπει από το GTK+"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7940,22 +8007,22 @@ msgstr ""
 "Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την "
 "τελευταία σταθερή έκδοση από %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν "
 "υποστήριξη για την libglade."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Το Gajim χρειάζεται την PySQLite2 για να εκτελεστεί"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Το Gajim χρειάζεται την pywin32 για να εκτελεστεί"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7963,11 +8030,11 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7975,34 +8042,34 @@ msgstr ""
 "Φαίνεται πως εκτελείται ήδη μια διεργασία του Gajim.\n"
 "Σίγουρα να εκτελεστεί;"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Εσφαλμένη φράση πρόσβασης"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8012,183 +8079,189 @@ msgstr ""
 "Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
 "Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Αίτηση εγγραφής"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Εγγραφή"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "H φράση πρόσβασης είναι λανθασμένη"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "H φράση πρόσβασης είναι λανθασμένη"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "Μη_ν με ξαναρωτήσεις"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Έχετε %d νέο μήνυμα ηλεκτρονικής αλληλογραφίας"
 msgstr[1] "Έχετε %d νέα μηνύματα ηλεκτρονικής αλληλογραφίας"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8198,95 +8271,95 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Username Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 #, fuzzy
 msgid "Error."
 msgstr "Σφάλμα:"
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8294,15 +8367,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8313,12 +8386,12 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Σύνδεση"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
@@ -8327,52 +8400,52 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
@@ -8409,12 +8482,13 @@ msgstr ""
 "ξεχωριστή γραμμή"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "λογαριασμός"
 
@@ -8441,9 +8515,9 @@ msgstr ""
 "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
 "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "μήνυμα"
 
@@ -8461,26 +8535,51 @@ msgstr ""
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Π_ροτεραιότητα:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"αλλαγή κατάστασης του λογαριασμού \"account\". Εάν δεν έχει καθοριστεί, "
+"δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
+"ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Εμφανίζει το διαλόγο κουβέντας ώστε να μπορείτε να στέλνετε μηνύματα σε μια "
 "επαφή"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "εάν έχει καθοριστεί, η επαφή λαμβάνεται από την λίστα επαφών αυτού του "
 "λογαριασμού"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8492,31 +8591,31 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "κλειδί pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "εάν καθοριστεί, το μήνυμα θα κρυπτογραφηθεί χρησιμοποιώντας αυτό το δημόσιο "
 "κλειδί"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "εάν οριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8528,226 +8627,226 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "θέμα"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "θέμα μηνύματος"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Λήψη αναλυτικών πληροφοριών για μία επαφή"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "το JID της επαφής"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Λήψη αναλυτικών πληροφοριών για ένα λογαριασμό"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Όνομα λογαριασμού"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "αρχείο"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "εάν οριστεί, το αρχείο θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Εμφανίζει όλες τις προτιμήσεις και τις τιμές τους"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Καταχωρεί την 'τιμή' στην τιμή του 'κλειδιού'"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "κλειδί=τιμή"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "Το 'κλειδί' είναι το όνομα της προτίμησης, ενώ 'τιμή' είναι η τιμή που του "
 "έχει προσδιοριστεί"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Διαγράφει μια προτίμηση"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "κλειδί"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "όνομα της προτίμησης που πρόκειται να διαγραφεί"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Προσθέτει μια νέα επαφή σε αυτό το λογαριασμό."
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Αναφέρει τον αριθμό των μη αναγνωσμένων μηνυμάτων"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 #, fuzzy
 msgid "Opens 'Start Chat' dialog"
 msgstr "Άνοιγμα του διαλόγου 'Έναρξη κουβέντας'"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Έναρξη κουβέντας με χρήση αυτού του λογαριασμού"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 #, fuzzy
 msgid "Sends custom XML"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 #, fuzzy
 msgid "XML to send"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 #, fuzzy
 msgid "Handle a xmpp:/ uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Σύνδεση σε νέο δωμάτιο"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "room"
 msgstr "Από"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Δωμάτιο:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "κωδικός πρόσβασης"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8756,31 +8855,31 @@ msgstr ""
 "Η επαφή '%s' δεν είναι στη λίστα σας.\n"
 "Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Ορίσματα:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8789,7 +8888,7 @@ msgstr ""
 "Χρήση: %s εντολή [ορίσματα]\n"
 "Η εντολή είναι μία από τις:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8798,7 +8897,7 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8807,7 +8906,7 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
@@ -8838,314 +8937,175 @@ msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντ
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Ιστορικό συζητήσεων"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Σύνδεση"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Συσχέτιση: "
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
-
-#: ../src/groupchat_control.py:1530
-#, fuzzy
-msgid "This group chat has no subject"
-msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Χρήση: /%s <ψευδώνυμο|JID> [λόγος], απαγορεύει το JID από το δωμάτιο. Το "
-"ψευδώνυμο του χρήστη μπορεί να αντικατασταθεί, αλλά όχι εάν περιέχει \"@\". "
-"Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ "
-"υποστηρίζει κενά στο ψευδώνυμο."
-
-#: ../src/groupchat_control.py:1734
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
-"συγκεκριμένο χρήστη."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Χρήση: /%s [λόγος], κλείνει το τρέχον παράθυρο ή καρτέλα, ανακοινώνοντας το "
-"λόγο εάν έχει προσδιοριστεί."
-
-#: ../src/groupchat_control.py:1746
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Χρήση: /%s <JID> [λόγος], προσκαλεί το JID στο τρέχον δωμάτιο, παρέχοντας "
-"προαιρετικά και λόγο."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Χρήση: /%s <δωμάτιο>@<διακομιστής>[/ψευδώνυμο], επιδιώκει την είσοδο στο "
-"δωμάτιο@διακομιστή, προαιρετικά χρησιμοποιώντας το ψευδώνυμο."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Χρήση: /%s <ψευδώνυμο> [αιτία], βγάζει τον χρήστη που προσδιορίστηκε από το "
-"δωμάτιο, προσδιορίζοντας την αιτία. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
-
-#: ../src/groupchat_control.py:1762
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Χρήση: /%s <ψευδώνυμο> [μήνυμα], ανοίγει ένα παράθυρο προσωπικού διαλόγου "
-"και στέλνει το μήνυμα στο χρήστη που προσδιορίστηκε."
-
-#: ../src/groupchat_control.py:1767
-#, fuzzy, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
-
-#: ../src/groupchat_control.py:1771
-#, fuzzy, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
-
-#: ../src/groupchat_control.py:1775
-#, fuzzy, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Χρήση: /%s <μήνυμα>, στέλνει ένα μήνυμα χωρίς να γίνει έλεγχος για άλλες "
-"εντολές."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
@@ -9223,6 +9183,15 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Αποθήκευση εικόνας ως..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Αρχηγός ομάδας παραθύρων"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδομένων ιστορικού"
@@ -9308,53 +9277,63 @@ msgstr "Ιστορικό κουβέντας με τον %s"
 msgid "Disk Error"
 msgstr "Σφάλμα:"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "Ο/Η %(nick)s είναι τώρα %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Μήνυμα σφάλματος: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Σφάλμα:"
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Η εικόνα είναι πολύ μεγάλη"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Συζητήσεις"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Μηνύματα"
 
@@ -9416,12 +9395,12 @@ msgstr "εννιά"
 msgid "Retrieving profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
@@ -9429,7 +9408,7 @@ msgstr "Δεν υπάρχει τέτοια συζήτηση."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
@@ -9466,47 +9445,47 @@ msgstr ""
 "Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
 "δοκιμάστε αργότερα."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9514,28 +9493,28 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9544,19 +9523,19 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9565,12 +9544,12 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Αυτό το ραντεβού θα απομακρυνθεί οριστικά."
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9579,60 +9558,73 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
+"άλλες επαφές."
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 #, fuzzy
 msgid "Rename Group"
 msgstr "Ιδιοκτήτης / Ομάδα"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Διαγραφή ομάδας"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9641,12 +9633,12 @@ msgstr ""
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9654,17 +9646,17 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9673,27 +9665,42 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
+"άλλες επαφές."
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -9701,31 +9708,31 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 msgstr[1] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Αποστολή %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
@@ -9735,125 +9742,137 @@ msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "στο λογαριασμό %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "/Προβολή/_Διαχείριση"
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr ""
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Εύρεση _υπηρεσιών..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Σε όλους τους χρήστες"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Σε όλους τους συνδεδεμένους χρήστες"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Μετονομασία αρχείων"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Επεξεργασία _ομάδων"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Αποστολή μονού μηνύματος"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Αδυναμία εκτέλεσης της εντολής:"
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Μεταφορές"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Μετονομασία"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "Αρχηγός ομάδας παραθύρων"
+msgid "_Disconnect"
+msgstr "Αποσύνδεση επαφής"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Είσοδος σε Ομαδική Συζήτηση"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Αλλαγή μηνύματος κατάστασης..."
 
@@ -9870,20 +9889,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Θέμα: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9893,7 +9912,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10088,6 +10107,139 @@ msgstr ""
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Προσθήκη ειδικής _γνωστοποίησης"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Ανάθεση κλειδιού Open_PGP"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Εντολές: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
+#~ "προσώπου (π.χ. /%s χοροπηδάει)."
+
+#, fuzzy
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr ""
+#~ "Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
+
+#, fuzzy
+#~ msgid "This group chat has no subject"
+#~ msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Χρήση: /%s <ψευδώνυμο|JID> [λόγος], απαγορεύει το JID από το δωμάτιο. Το "
+#~ "ψευδώνυμο του χρήστη μπορεί να αντικατασταθεί, αλλά όχι εάν περιέχει \"@"
+#~ "\". Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ "
+#~ "υποστηρίζει κενά στο ψευδώνυμο."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
+#~ "συγκεκριμένο χρήστη."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Χρήση: /%s [λόγος], κλείνει το τρέχον παράθυρο ή καρτέλα, ανακοινώνοντας "
+#~ "το λόγο εάν έχει προσδιοριστεί."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Χρήση: /%s <JID> [λόγος], προσκαλεί το JID στο τρέχον δωμάτιο, παρέχοντας "
+#~ "προαιρετικά και λόγο."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Χρήση: /%s <δωμάτιο>@<διακομιστής>[/ψευδώνυμο], επιδιώκει την είσοδο στο "
+#~ "δωμάτιο@διακομιστή, προαιρετικά χρησιμοποιώντας το ψευδώνυμο."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Χρήση: /%s <ψευδώνυμο> [αιτία], βγάζει τον χρήστη που προσδιορίστηκε από "
+#~ "το δωμάτιο, προσδιορίζοντας την αιτία. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Χρήση: /%s <ψευδώνυμο> [μήνυμα], ανοίγει ένα παράθυρο προσωπικού διαλόγου "
+#~ "και στέλνει το μήνυμα στο χρήστη που προσδιορίστηκε."
+
+#, fuzzy
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
+
+#, fuzzy
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Χρήση: /%s <μήνυμα>, στέλνει ένα μήνυμα χωρίς να γίνει έλεγχος για άλλες "
+#~ "εντολές."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Πατήστε για να δείτε τα χαρακτηριστικά (όπως μεταφορές MSN, ICQ) των "
diff --git a/po/en_GB.po b/po/en_GB.po
index 5e5643cd2..3d8de29a3 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:48+0200\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -212,6 +212,7 @@ msgstr "<b>Personal Information</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Account"
 
@@ -278,8 +279,8 @@ msgstr "Edit Personal Information..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -290,8 +291,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "General"
 
@@ -351,25 +352,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Information about you, as stored in the server"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "No key selected"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "None"
 
@@ -526,8 +523,8 @@ msgstr ""
 "You might consider to change possible firewall settings."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -541,7 +538,7 @@ msgid "Mer_ge accounts"
 msgstr "Mer_ge accounts"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Re_name"
 
@@ -801,7 +798,7 @@ msgid "All statuses"
 msgstr "All statuses"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Away"
 
@@ -818,7 +815,7 @@ msgid "Have "
 msgstr "Have "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -827,7 +824,7 @@ msgid "Launch a command"
 msgstr "Launch a command"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Not Available"
 
@@ -1012,7 +1009,7 @@ msgid "Join _Group Chat"
 msgstr "Join _Group Chat"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Add to Roster..."
 
@@ -1038,39 +1035,6 @@ msgstr "_Open Link in Browser"
 msgid "_Start Chat"
 msgstr "_Start Chat"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Invite _Contacts"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Send _File"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Toggle End to End Encryption"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Toggle Open_PGP Encryption"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Add to Roster"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_History"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "In_vite"
@@ -1095,6 +1059,119 @@ msgstr ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "A_sk to see his/her status"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Add Special _Notification..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Assign Open_PGP Key..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Execute Command..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Edit _Groups..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "In_vite to"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Invite _Contacts"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "Remo_ve"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Send Cus_tom Status"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Send Single _Message..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Send _File..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Set Custom _Avatar..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Start _Chat"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Toggle End to End Encryption"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Toggle Open_PGP Encryption"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Allow him/her to see my status"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Block"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Forbid him/her to see my status"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_History"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignore"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Manage Contact"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Rename..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Subscription"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Unblock"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Unignore"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Fill in the form."
@@ -1211,7 +1288,7 @@ msgstr ""
 "Contact row\n"
 "Chat Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Bold"
 
@@ -1235,7 +1312,7 @@ msgstr "Gone"
 msgid "Inactive"
 msgstr "Inactive"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Italic"
 
@@ -1307,6 +1384,14 @@ msgstr "Mo_derator"
 msgid "Occupant Actions"
 msgstr "Occupant Actions"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Send _File"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Add to Roster"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1315,13 +1400,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Ban"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Block"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Kick"
@@ -1338,13 +1416,6 @@ msgstr "_Owner"
 msgid "_Send Private Message"
 msgstr "_Send Private Message"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Unblock"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voice"
@@ -1353,7 +1424,7 @@ msgstr "_Voice"
 msgid "Create new post"
 msgstr "Create new post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "From"
 
@@ -1377,8 +1448,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Delete"
 
@@ -1431,34 +1502,39 @@ msgstr "Search:"
 msgid "_Log conversation history"
 msgstr "_Log conversation history"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Bookmark this room (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Join Group Chat"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Join this room automatically when I connect"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Nickname:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Password:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Recently:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Room:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Join"
@@ -1487,7 +1563,7 @@ msgstr "Minimise on Auto Join"
 msgid "Print status:"
 msgstr "Print status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2024,7 +2100,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sort contacts by status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2191,34 +2267,39 @@ msgid "All"
 msgstr "All"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "all by subscription"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Allow"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Deny"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Order:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Privacy List"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "all by subscription"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "all in the group"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2230,19 +2311,19 @@ msgstr ""
 "from\n"
 "to"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "to send me messages"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "to send me queries"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "to send me status"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "to view my status"
 
@@ -2410,96 +2491,11 @@ msgstr "Remove account from Gajim and from _server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "A_sk to see his/her status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Add Special _Notification..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Assign Open_PGP Key..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Edit _Groups..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Execute Command..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "In_vite to"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "Remo_ve"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Send Cus_tom Status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Send Single _Message..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Send _File..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Set Custom _Avatar..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Start _Chat"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Allow him/her to see my status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Forbid him/her to see my status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignore"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Manage Contact"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Rename..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Subscription"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Unignore"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2621,7 +2617,7 @@ msgid "_Add contact"
 msgstr "_Add contact"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Information"
 
@@ -2836,26 +2832,6 @@ msgstr "_Message"
 msgid "_Presence"
 msgstr "_Presence"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Add Special _Notification"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Assign Open_PGP Key"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Edit _Groups"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Rename"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modify Account..."
@@ -2900,48 +2876,48 @@ msgid "Service returned an error."
 msgstr "Service returned an error."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Activated"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Value"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(None)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Hidden"
 
@@ -2955,188 +2931,187 @@ msgstr "You have received new entry:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Breton"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "British"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Basque"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norwegian (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Serbian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Spelling language"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "A connection is not available"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Your message can not be sent until you are connected."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Undefined"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Sick"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Font:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Personal Information"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Really send file?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "If you send a file to %s, he/she will know your real Jabber ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG encryption enabled"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Not in Roster"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "A list of active, completed and stopped file transfers"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Unknown Artist"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Unknown Title"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Unknown Source"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3145,17 +3120,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "No GPG key assigned"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3163,50 +3138,50 @@ msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG encryption disabled"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Session WILL be logged"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Session WILL NOT be logged"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "is"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "is NOT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "will"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "will NOT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "and authenticated"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "and NOT authenticated"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3215,66 +3190,23 @@ msgstr ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Command not supported for zeroconf account."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Commands: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Usage: /%s, clears the text window."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Usage: /%s, hide the chat buttons."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Usage: /%s, sends a ping to the contact"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Usage: /%s, send the message to the contact"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "No help info for /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Session negotiation cancelled"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "This session is encrypted"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " and WILL be logged"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " and WILL NOT be logged"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3282,25 +3214,25 @@ msgstr ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E encryption disabled"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "The following message was NOT encrypted"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "The following message was encrypted"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3308,15 +3240,15 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Database Error"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3325,7 +3257,7 @@ msgstr ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is now %(status)s"
@@ -3334,23 +3266,23 @@ msgstr "%(name)s is now %(status)s"
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is a file but it should be a directory"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is a directory but should be a file"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
@@ -3414,9 +3346,9 @@ msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Groupchats"
 
@@ -3432,68 +3364,109 @@ msgstr "Forward unread messages"
 msgid "All unread messages have been forwarded."
 msgstr "All unread messages have been forwarded."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Use D-Bus and Notification-Daemon to show notifications"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Time in minutes, after which your status changes to away."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Away as a result of being idle more than $T min)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr "$S will be replaced by current status message, $T by autoaway time."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Time in minutes, after which your status changes to not available."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Not available as a result of being idle more than $T min)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S will be replaced by current status message, $T by autoxa time."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Invalid nickname"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "status message text"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Invalid nickname"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Changing Nickname"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "status message text"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "default"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Enable link-local/zeroconf messaging"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Language used by speller"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3503,7 +3476,7 @@ msgstr ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3513,17 +3486,17 @@ msgstr ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3533,7 +3506,7 @@ msgstr ""
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3541,7 +3514,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3549,7 +3522,7 @@ msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3559,19 +3532,19 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Add * and [n] in roster title?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3579,11 +3552,25 @@ msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "How many minutes should last lines from previous conversation last."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3591,11 +3578,11 @@ msgstr ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3604,11 +3591,11 @@ msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3620,13 +3607,13 @@ msgstr ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3634,7 +3621,7 @@ msgstr ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3642,11 +3629,11 @@ msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3654,7 +3641,7 @@ msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3662,13 +3649,13 @@ msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3676,27 +3663,27 @@ msgstr ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Notify of events in the system trayicon."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3708,17 +3695,17 @@ msgstr ""
 "numbers are more secure, but take longer to calculate when you start a "
 "session."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Preview new messages in notification popup?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3726,13 +3713,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3740,7 +3727,7 @@ msgstr ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3748,11 +3735,11 @@ msgstr ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Define the position of the avatar in roster. Can be left or right"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3760,7 +3747,7 @@ msgstr ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3768,7 +3755,7 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3782,29 +3769,29 @@ msgstr ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Background colour of contacts when they just signed in."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Background colour of contacts when they just signed out."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "If True, restored messages will use a smaller font than the default one."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3814,7 +3801,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3825,7 +3812,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3845,31 +3832,31 @@ msgstr ""
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "If False, you will no longer see the avatar in the chat window."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Hides the buttons in chat windows."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Hides the banner in a group chat window"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Hides the banner in two persons chat window"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3877,15 +3864,15 @@ msgstr ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Smooth scroll message in conversation window"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3893,11 +3880,11 @@ msgstr ""
 "List of colours, separated by \":\", that will be used to colour nicknames "
 "in group chats."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3905,7 +3892,25 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Should we show the confirm metacontacts creation dialogue or not? Empty "
+"string means we never show the dialogue."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Should we show the confirm metacontacts creation dialogue or not? Empty "
+"string means we never show the dialogue."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3915,7 +3920,7 @@ msgstr ""
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3923,7 +3928,7 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3932,7 +3937,7 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3940,7 +3945,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3948,7 +3953,7 @@ msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3956,7 +3961,7 @@ msgstr ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3964,11 +3969,11 @@ msgstr ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Time of inactivity needed before the change status window closes down."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3976,7 +3981,7 @@ msgstr ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3984,11 +3989,11 @@ msgstr ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Choose interval between 2 checks of idleness."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3996,7 +4001,7 @@ msgstr ""
 "Change the value to change the size of latex formulae displayed. The higher "
 "is larger."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4005,13 +4010,23 @@ msgstr ""
 "Valid URI schemes. Only schemes in this list will be made accepted as \"real"
 "\" URI."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4019,7 +4034,7 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4027,25 +4042,36 @@ msgstr ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "If enabled, restore the last status that was used."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "If False, you will no longer see the avatar in the chat window."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Enable ESessions encryption for this account."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Should Gajim automatically start an encrypted session when possible?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4053,29 +4079,29 @@ msgstr ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Space separated list of SSL errors to ignore."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4085,11 +4111,11 @@ msgstr ""
 "reconnect."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4097,15 +4123,15 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Answer to receipt requests"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Sent receipt requests"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4113,11 +4139,11 @@ msgstr ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4125,101 +4151,101 @@ msgstr ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "all or space separated status"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', or 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' or ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4227,99 +4253,99 @@ msgstr ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Wrong host"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Invalid local address? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registration information for transport %s has not arrived in time"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Register to %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Connection Failed"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Invisibility not supported"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Account %s doesn't support invisibility."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4328,77 +4354,84 @@ msgstr ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname not allowed: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "You are banned from group chat %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Group chat %s does not exist."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Your registered nickname must be used in group chat %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "You are not in the members list in groupchat %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Room has been destroyed"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "You can join this room instead: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we are now subscribed to %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we are now unsubscribed from %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4407,219 +4440,205 @@ msgstr ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passphrase was not given"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "You will be connected to %s without OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Unable to decode issuer public key"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Certificate signature failure"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "CRL signature failure"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Certificate is not yet valid"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Certificate has expired"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL is not yet valid"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL has expired"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Self signed certificate"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Self signed certificate in certificate chain"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Unable to get local issuer certificate"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Unable to verify the first certificate"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Certificate chain too long"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Certificate revoked"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Invalid CA certificate"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Path length constraint exceeded"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Unsupported certificate purpose"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Certificate not trusted"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Certificate rejected"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Key usage does not include certificate signing"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s answered wrongly to register request: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unknown SSL error: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s answered wrongly to register request: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Saved in: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Connection to proxy failed"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Could not connect to account %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connection with account %s has been lost. Retry connecting."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "The authenticity of the %s certificate could be invalid."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4628,7 +4647,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4637,24 +4656,24 @@ msgstr ""
 "\n"
 "Unknown SSL error: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4663,30 +4682,30 @@ msgstr ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "It is not possible to send empty files"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Neither the remote presence is signed, nor a key was assigned."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "The contact's key (%s) does not match the key assigned in Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[This message is *encrypted* (See :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4695,30 +4714,40 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Invite _Contacts"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Connection Failed"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Observers"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transports"
 
@@ -4727,14 +4756,19 @@ msgid "Not in roster"
 msgstr "Not in roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus capabilities of Gajim cannot be used"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -4809,56 +4843,69 @@ msgid "eleven"
 msgstr "eleven"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s o'clock"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "five past %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "ten past %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "quarter past %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "twenty past %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "twenty five past %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "half past %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "twenty five to %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "twenty to %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "quarter to %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "ten to %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "five to %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s o'clock"
 
@@ -4926,224 +4973,224 @@ msgstr "Invalid character in hostname."
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Busy"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Not Available"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Free for Chat"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Free for Chat"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Available"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Available"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "A_way"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Unknown"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "Has errors"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "None"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "is composing a message..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message pending"
 msgstr[1] "%d messages pending"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " from room %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " from user %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " from %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d event pending"
 msgstr[1] "%d events pending"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Error executing \"%(command)s\": %(error)s"
@@ -5159,11 +5206,11 @@ msgstr "%s is not a valid loglevel"
 msgid "error: cannot open %s for reading"
 msgstr "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -5815,7 +5862,7 @@ msgstr ""
 "cancelled."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5823,7 +5870,7 @@ msgstr ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5832,16 +5879,28 @@ msgstr ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP passphrase was not given"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "You will be connected to %s without OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "To continue sending and receiving messages, you will need to reconnect."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5850,31 +5909,31 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5883,20 +5942,20 @@ msgstr ""
 "sent."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[This message is encrypted]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Your message could not be sent."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5908,24 +5967,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Default Message"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5934,69 +5993,69 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is not usable in this computer"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6004,139 +6063,145 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Rename Account"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for account %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "A Jabber ID must be in the form \"user@servername\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "There was a problem retrieving your OpenPGP secret keys."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "You must create your account before editing your personal information."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Without a connection, you can not edit your personal information."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "To change the account name, you must be disconnected."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Please rename or remove it before enabling link-local messaging."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6144,11 +6209,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6156,11 +6221,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6168,11 +6233,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6180,7 +6245,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6197,124 +6262,123 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Nickname not allowed: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Invalid server"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Invalid entry"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Please provide a server on which you want to register."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Certificate Already in File"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "This certificate is already in file %s, so it's not added again."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6329,7 +6393,7 @@ msgstr ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6340,63 +6404,63 @@ msgstr ""
 "SHA1 fingerprint of the certificate:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Next Message Received Focused"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Next Message Received Unfocused"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6406,7 +6470,7 @@ msgstr ""
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6414,74 +6478,74 @@ msgstr ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Quit"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i days ago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Jabber ID already in list"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "The Jabber ID you entered is already in the list. Choose another one."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6516,123 +6580,123 @@ msgstr "Contact name"
 msgid "Set Mood"
 msgstr "Set Mood"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Overwrite Status Message?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "This name is already used. Do you want to overwrite this status message?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Please fill in the data of the contact you want to add in account %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "You cannot add yourself to your roster."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Last but not least, we would like to thank all the package maintainers."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6645,88 +6709,98 @@ msgstr ""
 "\n"
 "Highlighting misspelt words feature will not be used"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "The nickname has not allowed characters."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Subscription request for account %(account)s from %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Invalid account name"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Account from which you want to enter the room"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Invalid Nickname"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s is not the name of a group chat."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "This account is not connected to the server"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "You cannot synchronise with an account unless it is connected."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6735,300 +6809,300 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "New Message"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Form %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "I would like to add you to my contact list."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Address"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Moody"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Group"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "I would like to add you to my roster."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "You must enter a name to create a privacy list."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "You are invited to a groupchat"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to join a discussion"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Do you want to accept the invitation?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7039,19 +7113,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "You have already verified this contact's identity."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Contact's identity verified"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Verify again..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7061,19 +7135,19 @@ msgstr ""
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Contact's identity NOT verified"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Verify..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Have you verified the contact's identity?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7088,22 +7162,22 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Did you talk to the remote contact and verify the SAS?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7111,7 +7185,7 @@ msgstr ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7206,20 +7280,20 @@ msgstr "Description"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "You can manage your bookmarks via Actions menu in your roster."
 
@@ -7231,15 +7305,15 @@ msgstr "Subscribed"
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
@@ -7691,31 +7765,31 @@ msgstr "Gajim needs X server to run. Quiting..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim needs PyGTK 2.8 or above"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim needs GTK 2.8 or above"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim needs GTK 2.8 or above to run. Quiting..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime is missing libglade support"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7724,21 +7798,21 @@ msgstr ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim needs PySQLite2 to run"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim needs pywin32 to run"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7748,11 +7822,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7760,35 +7834,35 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "No GPG key assigned"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7799,59 +7873,59 @@ msgstr ""
 "occupant.\n"
 "Please specify another nickname below:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request on account %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Subscription Request"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7859,77 +7933,77 @@ msgstr ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Unsubscribe"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s is now known as %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s has set the subject to %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Any occupant is allowed to see your full JID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Room now shows unavailable member"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "room now does not show unavailable members"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "A non-privacy-related room configuration change has occurred"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Room logging is now enabled"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Room logging is now disabled"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Room is now fully-anonymous"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "A Password is required to join the room %s. Please type it."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7937,20 +8011,25 @@ msgstr ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Your passphrase is incorrect"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG is not usable"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7958,13 +8037,14 @@ msgid ""
 msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "Do _not ask me again"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7973,19 +8053,19 @@ msgstr ""
 "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
 "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "You have %d new mail conversation"
 msgstr[1] "You have %d new mail conversations"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8000,44 +8080,44 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Error reading file:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "You successfully received %(filename)s from %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8046,36 +8126,36 @@ msgstr ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Unable to decrypt message"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Error."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8083,11 +8163,11 @@ msgstr ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Error verifying SSL certificate"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8098,15 +8178,15 @@ msgstr ""
 "(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignore this error for this certificate."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "SSL certificate error"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8123,11 +8203,11 @@ msgstr ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Insecure connection"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8135,11 +8215,11 @@ msgstr ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Yes, I really want to connect insecurely"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8147,21 +8227,21 @@ msgstr ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "PEP node was not removed"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP node %(node)s was not removed: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Emoticons disabled"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8169,7 +8249,7 @@ msgstr ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8179,13 +8259,13 @@ msgstr ""
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "You cannot join a group chat while you are invisible"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
@@ -8219,12 +8299,13 @@ msgstr ""
 "separate line"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "account"
 
@@ -8249,9 +8330,9 @@ msgstr "status"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "message"
 
@@ -8268,22 +8349,46 @@ msgstr ""
 "of all accounts that have \"sync with global status\" option set"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Changes the status of account or accounts"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_ty:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "I want to _register for a new account"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Shows the chat dialogue so that you can send messages to a contact"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID of the contact that you want to chat with"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8293,29 +8398,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "message contents"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp key"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8325,134 +8430,134 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sends new message to a groupchat you've joined."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID of the room that will receive the message"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Adds new contact to this account"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8460,72 +8565,72 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI to handle"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Account in which you want to handle it"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "message contents"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "Room JID"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Nickname to use"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Password to enter the room"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Account from which you want to enter the room"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Check if Gajim is running"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Shows or hides the ipython window"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8534,15 +8639,15 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "It seems Gajim is not running. So you can't use gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8551,16 +8656,16 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8569,7 +8674,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8578,7 +8683,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8587,7 +8692,7 @@ msgstr ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Wrong uri"
 
@@ -8616,289 +8721,151 @@ msgstr "You cannot delete your current theme"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Conversation with "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Continued conversation"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Room logging is enabled"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "A new room has been created"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "The server has assigned or modified your roomnick"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s has been removed from the room (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "affiliation changed"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "system shutdown"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Affiliation of %(nick)s has been set to %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Role of %(nick)s has been set to %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Nickname not found: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "This group chat has no subject"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Invited %(contact_jid)s to %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Nickname not found: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked. Does "
-"NOT support spaces in nickname."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason. Does NOT support "
-"spaces in nickname."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Usage: /%s , display the names of group chat occupants."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Usage: /%s [topic], displays or updates the current group chat topic."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "If you close this window, you will be disconnected from this group chat."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Please specify the new nickname you want to use:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Destroying %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8906,22 +8873,22 @@ msgstr ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "You may also enter an alternate venue:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
@@ -8993,6 +8960,14 @@ msgstr "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_New Group Chat"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "I would like to add you to my roster"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
@@ -9075,52 +9050,62 @@ msgstr "Conversation History with %s"
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is now %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Error message: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Error."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is now: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Timeout loading image"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Image is too big"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "You are not connected to the server"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Do you really want to delete the selected message?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Messages"
 
@@ -9181,18 +9166,18 @@ msgstr "_Ignore"
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "File is empty"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "File does not exist"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Could not load image"
 
@@ -9224,46 +9209,46 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Now \"%s\" will know your status."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG is not usable"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9271,28 +9256,28 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "desync'ed"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9300,16 +9285,16 @@ msgstr ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9317,11 +9302,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9330,57 +9315,69 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Do you want to remove group %s from the roster?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Also remove all contacts in this group from your roster"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9389,11 +9386,11 @@ msgstr ""
 "her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9401,16 +9398,16 @@ msgstr ""
 "By removing this contact you also by default remove authorisation resulting "
 "in him or her always seeing you as offline."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "I want this contact to know my status after removal"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9419,19 +9416,33 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "You must create an account before you can chat with other contacts."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9439,13 +9450,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9455,23 +9466,23 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Do you want to send this file to %s:"
 msgstr[1] "Do you want to send these files to %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Send %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Make %s and %s metacontacts"
@@ -9481,115 +9492,127 @@ msgstr "Make %s and %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "using account %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Manage Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "for account %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Change Status Message"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Configure Services..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "To all users"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "To all online users"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "I would like to add you to my roster"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Edit _Groups"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Send Single Message"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Execute Command..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Manage Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Modify Transport"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Rename"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Disconnect"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_New Group Chat"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Disconnect"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
@@ -9606,20 +9629,20 @@ msgstr "Error in received dataform"
 msgid "No result"
 msgstr "No result"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Disk WriteError"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Confirm these session options"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9634,7 +9657,7 @@ msgstr ""
 "\n"
 "\tAre these options acceptable?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9830,6 +9853,133 @@ msgstr "There is no pending subscription request."
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Add Special _Notification"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Assign Open_PGP Key"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Command not supported for zeroconf account."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Commands: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Usage: /%s, clears the text window."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Usage: /%s, hide the chat buttons."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Usage: /%s, sends a ping to the contact"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Usage: /%s, send the message to the contact"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "No help info for /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Enable link-local/zeroconf messaging"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Nickname not found: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "This group chat has no subject"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Invited %(contact_jid)s to %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Nickname not found: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked. "
+#~ "Does NOT support spaces in nickname."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason. Does NOT "
+#~ "support spaces in nickname."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Usage: /%s , display the names of group chat occupants."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr "Click to see features (like MSN, ICQ transports) of jabber servers"
 
diff --git a/po/eo.po b/po/eo.po
index 0dd3e6c8f..ff244d63a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:48+0200\n"
 "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -220,6 +220,7 @@ msgstr "<b>Persona informo</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Konto"
 
@@ -286,8 +287,8 @@ msgstr "Korekti personan informon..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -298,8 +299,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Ĝenerala"
 
@@ -356,25 +357,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informo pri vi, kiel estas en la servilo"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Neniu ŝlosilo elektita"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Neniu"
 
@@ -531,8 +528,8 @@ msgstr ""
 "Vi povas pripensi ŝanĝon de permeseblaj parametroj de retŝirmilo."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
@@ -546,7 +543,7 @@ msgid "Mer_ge accounts"
 msgstr "_Unuigi kontojn"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Re_nomigi"
 
@@ -810,7 +807,7 @@ msgid "All statuses"
 msgstr "ia ajn stato"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Fora"
 
@@ -827,7 +824,7 @@ msgid "Have "
 msgstr "Havas "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Nevidebla"
 
@@ -836,7 +833,7 @@ msgid "Launch a command"
 msgstr "Lanĉi komandon"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Nedisponebla"
 
@@ -1032,7 +1029,7 @@ msgid "Join _Group Chat"
 msgstr "Eniri en babilejon"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "_Aldoni al kontaktlisto"
@@ -1059,65 +1056,154 @@ msgstr "_Malfermi ligilon per retrigardilo"
 msgid "_Start Chat"
 msgstr "_Ekparoli"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "In_viti al"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Rigardiloj"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Peti por vidi lian/ŝian staton"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Aligi specialan _avizon"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Enigi Open_PGP-ŝlosilon"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Plenumi komandon..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Aranĝi _Grupojn"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "In_viti al"
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Kontaktoj"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Forigi"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Sendi propran XML"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Sendi unuopan _mesaĝon..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "Sendi _dosieron"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Ekparoli"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Baskuli Open_PGP-ĉifradon"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Baskuli Open_PGP-ĉifradon"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Aldoni al kontaktlisto"
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Permesi al li/ŝi vidi vian staton"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Malpermesi al li/ŝi vidi vian staton"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "_Historio"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "In_viti al"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "Rigardiloj"
+msgid "_Manage Contact"
+msgstr "Renomigado de kontakto"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Renomigi"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Abono"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "naŭ"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Plenigu la formon."
@@ -1238,7 +1324,7 @@ msgstr ""
 "Kontakta linio\n"
 "Rubando"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Dika"
 
@@ -1262,7 +1348,7 @@ msgstr "Foriris"
 msgid "Inactive"
 msgstr "Neaktiva"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Kursiva"
 
@@ -1340,6 +1426,14 @@ msgstr "Mo_derigisto"
 msgid "Occupant Actions"
 msgstr "_Agoj por babilanto"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Sendi _dosieron"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Aldoni al kontaktlisto"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Estro"
@@ -1348,13 +1442,6 @@ msgstr "_Estro"
 msgid "_Ban"
 msgstr "_Malpermesi"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Elpeli"
@@ -1371,13 +1458,6 @@ msgstr "_Mastro"
 msgid "_Send Private Message"
 msgstr "_Sendi privatan mesaĝon"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voĉo"
@@ -1387,7 +1467,7 @@ msgstr "_Voĉo"
 msgid "Create new post"
 msgstr "Nova mesaĝo"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "De"
 
@@ -1418,8 +1498,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim administrilo de protokoloj"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Forigi"
 
@@ -1465,34 +1545,39 @@ msgstr "Serĉi"
 msgid "_Log conversation history"
 msgstr "_Protokoli komunikadan historion"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Starigi legosignon por tiu babilejo"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Eniri babilejen"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Aŭtomate aliĝi al ĉi tiu babilejo kiam vi konektitos"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Kaŝnomo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Antaŭ nelonge:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Babilejo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Aliĝi"
@@ -1521,7 +1606,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Eligi statojn:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Servilo:"
 
@@ -2072,7 +2157,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "_Ordigi kontaktojn per stato"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Stato"
 
@@ -2245,34 +2330,39 @@ msgid "All"
 msgstr "Ĉiuj"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "ĉiuj laŭ abonado"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Permesi"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Rifuzi"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "Jabber-ID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Ordnumero:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Privata listo"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "ĉiuj laŭ abonado"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "ĉiuj en la grupo"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2284,19 +2374,19 @@ msgstr ""
 "de\n"
 "al"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "sendi mesaĝojn al mi"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "sendi informmendojn al mi"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "sendi staton al mi"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "vidi mian staton"
 
@@ -2488,105 +2578,11 @@ msgstr "Forigi konton el Gajim kaj el _servilo"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Forigi"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Peti por vidi lian/ŝian staton"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Aligi specialan _avizon"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Enigi Open_PGP-ŝlosilon"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "Aranĝi _Grupojn"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Plenumi komandon..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "In_viti al"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Forigi"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Sendi propran XML"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Sendi unuopan _mesaĝon..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "Sendi _dosieron"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Ekparoli"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Permesi al li/ŝi vidi vian staton"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Malpermesi al li/ŝi vidi vian staton"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "Renomigado de kontakto"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Renomigi"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Abono"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "naŭ"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2713,7 +2709,7 @@ msgid "_Add contact"
 msgstr "Aldoni _kontakton"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "Kontakta informo"
@@ -2938,26 +2934,6 @@ msgstr "_Mesaĝo"
 msgid "_Presence"
 msgstr "_Ĉeesto"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Aligi specialan _avizon"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Enigi Open_PGP-ŝlosilon"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Aranĝi _Grupojn"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Renomigi"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Korekti konton..."
@@ -3002,48 +2978,48 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Ŝaltita"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Malŝaltita"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Bulea"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Entjera"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Teksto"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Koloro"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Parametra nomo"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Valoro"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Datumtipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Mankas)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Kaŝita"
 
@@ -3057,251 +3033,250 @@ msgstr ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Angla"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Belorusa"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretona"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Ĉeĥa"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Germana"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Greka"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Brita"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Eŭska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Franca"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Itala"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norvega (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Nederlanda"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Pola"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brazila Portugala"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Serbian"
 msgstr "Germana"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Sveda"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Ĉina (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Lingvo de literumado"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Konekto mankas"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Via mesaĝo ne povas esti sendita dum vi senkonektas."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Substreko"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Kaŝnomo"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Tiparo:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontakta informo"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Ĉifrado ebligata"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Uzi aŭtentokontrolon"
@@ -3309,100 +3284,58 @@ msgstr "Uzi aŭtentokontrolon"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Komandoj: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s eksplodas)."
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr ""
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "helpinformo mankas por /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3410,22 +3343,22 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
@@ -3434,23 +3367,23 @@ msgstr "%(nick)s nun estas %(status)s"
 msgid "creating logs database"
 msgstr "kreadas protokolan datumbazon"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s estas dosiero sed devas esti dosierujo"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim fermos tuj"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s estas dosierujo sed devas esti dosiero"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "kreas dosierujon %s"
@@ -3522,9 +3455,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 #, fuzzy
 msgid "Groupchats"
 msgstr "Babilejoj"
@@ -3543,70 +3476,111 @@ msgstr " %d nelegita mesaĝo"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Uzi D-Bus kaj avizadan demonon por montri avizojn"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al fora."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Aŭtomate fora"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al nedisponebla."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Nedisponebla pro longa senfarado"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Malkorekta salutnomo"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "statmesaĝa teksto"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Malkorekta salutnomo"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Ŝanĝas kaŝnomon"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "statmesaĝa teksto"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "Defaŭlte"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Ebligi lig-lokan/zerokonf komunikadon"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Lingvo uzata de literumilo"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3616,7 +3590,7 @@ msgstr ""
 "'sometimes' - eligi tempon ĉiun print_ichat_every_foo_minutes minuton.\n"
 "'never' - neniam eligi tempon."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3627,18 +3601,18 @@ msgstr ""
 "preciza, 4 por la malplej preciza. Ĉi tio uzatas nur kiam print_time estas "
 "'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Trakti parojn * / _ kiel stiligajn signojn."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se \"True\", ne forigos */_ . Do *abc* estos dika sed restos kun neforigitaj "
 "* *."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3648,7 +3622,7 @@ msgstr ""
 "elektitas. Pri sintakso vidu http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (Se vi volas uzi tion, instalu docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3656,7 +3630,7 @@ msgstr ""
 "Signo kiu aligatos post kaŝnomo dum uzado de plenumigoklavo (Tab) en "
 "babilejo."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3664,7 +3638,7 @@ msgstr ""
 "Signo por aligi post dezirata kaŝnomo kiam iu alia en babilejo jam okupis "
 "tiun kaŝnomon."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3675,19 +3649,19 @@ msgstr ""
 "vidu pitonan dokumentaron pri la funkcio \"strftime\": http://docs.python."
 "org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Signoj kiuj eligotas antaŭ kaŝnomo en konversacioj"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Signoj kiuj eligotas post kaŝnomo en konversacioj"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Ĉu aligi * kaj [n] al kontaktlisto titolo?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3695,11 +3669,25 @@ msgstr ""
 "Kiom da lineoj memori de antaŭa komunikado kiam interparola slipo/fenestro "
 "malfermas denove."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kiom da minutoj devas resti lastaj lineoj de antaŭa komunikado."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3707,11 +3695,11 @@ msgstr ""
 "Sendi mesaĝon per Ctrl+Enter kaj Enter faras novan lineon (defaŭlta "
 "kondutmaniero de Mirabilis ICQ Kliento)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kiom lineojn memori por Ctrl+Supren."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3720,11 +3708,11 @@ msgstr ""
 "Enigi propran URL kun %s en ĝi, kie %s estos la vorto/frazo, aŭ \"WIKTIONARY"
 "\" kio signifas uzi wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se markitas, oni eblas komandi al Gajim malproksime per gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3736,14 +3724,14 @@ msgstr ""
 "listen_to_network_manager=False kaj sync_with_global_status=True) surbaze de "
 "la stato de la retkonekto."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3751,7 +3739,7 @@ msgstr ""
 "Montrataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3759,11 +3747,11 @@ msgstr ""
 "Kiam ne eligas tempon por ĉiu mesaĝo (print_time==sometimes), eligi ĝin "
 "ĉiujn x minutojn."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3771,7 +3759,7 @@ msgstr ""
 "Ĉiam demandi antaŭ fermi slipon/fenestron de babilejo el tiu cpacetdisigita "
 "listo de babilejaj JID."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3779,13 +3767,13 @@ msgstr ""
 "Neniam demandi antaŭ fermi babilejan slipon/fenestron el tiu ĉi listo de "
 "babilejaj JID separataj per spacetoj."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3794,27 +3782,27 @@ msgstr ""
 "Redifinas la retadreson, kiun ni sendas por dosiertransmeto okaze de "
 "adrestradukado."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC normo diras: KiB = 1024 bajtoj, KB = 1000 bajtoj."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Avizi eventojn en la sistema taskopleta bildeto."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Ĉu montri langeton kiam estas nur unu konversacio?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Ĉu montri langetan framon en interparolajn fenestrojn?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Ĉu montri fermontan butonon en sliplangeto?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3822,17 +3810,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3840,14 +3828,14 @@ msgstr ""
 "Se \"True\", finas Gajim kiam oni alklakas fenestran sisteman butonon X. "
 "Tiun ĉi parametron mi konsideras nur se pleta piktogramo uzatas."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "se \"True\", Gajim kontrolos ĉu ĝi estas defaŭlta jabber-kliento dum ĉiu "
 "lanĉo."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3855,7 +3843,7 @@ msgstr ""
 "Se \"True\", Gajim montros piktogramon sur ĉiuj langeton, kies slipo enhavas "
 "nelegitajn mesaĝojn. Depende de etoso tiu piktogramo povas esti animaciata."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3863,11 +3851,11 @@ msgstr ""
 "Se estas \"True\", Gajim montros statmesaĝojn, se ĝi ne estas malplena, por "
 "ĉiu kontakto sub la kontaktnomo en la kontaktlisto."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3875,7 +3863,7 @@ msgstr ""
 "Se \"True\", Gajim demandos pri kaŝbildeto ĉiun kontakton, kiu ne havis ĝin "
 "lastatempe aŭ kies kaŝbildeto estis konservita tro antaŭlonge."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3883,7 +3871,7 @@ msgstr ""
 "Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
 "kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ statmesaĝon."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3896,29 +3884,29 @@ msgstr ""
 "statmesaĝon. Se \"all\", Gajim eligos ĉiuj statmesaĝoj. Se \"in_and_out\", "
 "Gajim eligos nur pri eniroj/eliroj."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Fona koloro de kontaktoj kiam ili jus elsalutis."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se \"True\", rememoritaj mesaĝoj uzos pli malgrandan tiparon ol defaŭltaj."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne montri kaŝbildeton por transportilo mem."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne montri kontaktliston en la sistema taskostrio."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3928,7 +3916,7 @@ msgstr ""
 "fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
 "kiam estas atendantaj eventoj."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3939,7 +3927,7 @@ msgstr ""
 "informon en babilejo."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3959,32 +3947,32 @@ msgstr ""
 "apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
 "antaŭ la ŝanĝo efikos."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se \"True\", premo de la klavo \"Escape\" fermas slipon/fenestron."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Kaŝas rubandon en dupersona interparola fenestro"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Kaŝas la liston de partoprenantoj en la babileja fenestro."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3992,27 +3980,27 @@ msgstr ""
 "En konversacio, montri la kaŝnomon komence de linio nur kiam tiu ne estas la "
 "sama persono dirinta ĉi-antaŭan mesaĝon."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Alineo kiam uzatas unuigo de ripetaj kaŝnomoj."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Sendi mesaĝon kaj fermi fenestron"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Listo de koloroj kiuj estos uzata por kolorigi kaŝnomojn en babilejoj."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab iras al sekva konversacian langeton se ĉiuj legitas."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4020,7 +4008,25 @@ msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
+"Malplena linio signifas ke ni neniam monru la dialogujon."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
+"Malplena linio signifas ke ni neniam monru la dialogujon."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -4030,7 +4036,7 @@ msgstr ""
 "nombroj en la konta korekdada fenestro. GARDU VIN, se vi ensalutis kun "
 "negativa prioritato, vi ricevos neniujn mesaĝojn de via servilo."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4038,7 +4044,7 @@ msgstr ""
 "Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
 "pasvortojn."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4047,7 +4053,7 @@ msgstr ""
 "Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
 "pasvortojn."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4055,7 +4061,7 @@ msgstr ""
 "Se \"True\", Gajim montros kvantojn de konektitaj kaj ĉiuj kontaktoj en "
 "kontaj kaj grupaj linioj."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4063,57 +4069,67 @@ msgstr ""
 "Povas esti malplena, 'chat' aŭ 'normal'. Se ne malplena, rigardi ĉiujn "
 "venantajn mesaĝojn kiel ili estas de ĉi tiu tipo"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4121,68 +4137,79 @@ msgstr ""
 "Prioritato ŝanĝiĝos aŭtomate laŭ via stato. Prioritatoj specifatas en la "
 "agorderoj \"autopriority_*\"."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 ĉirkaŭiro"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4190,125 +4217,125 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "'all' aŭ spacetseparitaj statoj"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', aŭ 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' aŭ ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Manĝas"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Mi manĝas, do restigu mesaĝon por mi."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Kino"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Laboras"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefonado"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Eliris"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4316,178 +4343,185 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "verda"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "manĝbutiko"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "homa"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "mara"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Malprava servilnomo"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrada informo por transportilo %s ne venis ĝustatempe"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Vizitkarto estas sukcese publicita"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kaŝnomo malpermesita: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Babileja kreado limigitas."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vi devas uzi vian registritan kaŝnomon."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vi ne ĉeestas en membrolisto."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Permeso estas forigita"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nun ni abonas %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "ordono pri abona fino de %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ni nun ne abonas pri %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4496,254 +4530,240 @@ msgstr ""
 "JID %s ne estas norma laŭ la RFC. Ĝi ne aldonitos al via kontaktlisto. Uzu "
 "kontaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por forigi ĝin"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP-pasfrazo ne estis donita"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Vi estos konektita al %s sen OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Rekonektu mane."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transportilo %s respondis malprave al registra peto: %s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Nekorekta respondo"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transportilo %s respondis malprave al registra peto: %s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Kontrolu vian konekton aŭ provu denove poste."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Kontrolu vian konekton aŭ provu denove poste"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Eraro dum forigado de privata listo"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4752,31 +4772,31 @@ msgstr ""
 "Privata listo %s ne forigitis. Ĝi eble estas aktiva en unu el viaj "
 "konektitaj risurcoj. Malaktivigu ĝin kaj provu denove."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4785,30 +4805,40 @@ msgstr ""
 "Temo: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktoj"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Konektado malsukcesis"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Rigardiloj"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transportiloj"
 
@@ -4817,14 +4847,19 @@ msgid "Not in roster"
 msgstr "Mankas en kontaktlisto"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Pitona bindmodulo por D-BUS mankas cxe tiu cxi komputilo"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-BUS kunigeblo de Gajim ne uzeblas"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (ankaŭ konata kiel python-pysqlite2) mankas. Finas..."
@@ -4900,56 +4935,69 @@ msgid "eleven"
 msgstr "dekunu"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "la %(0)sa horo"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "kvin minutoj post la %(0)sa"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "dek minutoj post la %(0)sa"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "kvarono post la %(0)sa"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "dudek minutoj post la %(0)sa"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "dudek kvin minutoj post la %(0)sa"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "la %(0)sa kaj duono"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "dudek kvin minutoj antaŭ la %(1)sa"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "dudek minutoj antaŭ la %(1)sa"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "kvarono antaŭ la %(1)sa"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "dek minutoj antaŭ la %(1)sa"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "kvin minutoj antaŭ la %(1)sa"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "la %(1)sa horo"
 
@@ -5017,224 +5065,224 @@ msgstr "Malkorekta signo en servilnomo."
 msgid "Invalid character in resource."
 msgstr "Malkorekta signo en risurcnomo."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Okupata"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Okupata"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Nedisponebla"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Babilema"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Babilema"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Enrete"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Enrete"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Konektas"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "_Fora"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Senkonekta"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "Ne_videbla"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Nekonata"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "Eraroj"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Al"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Nenion"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderigantoj"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderiganto"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Partoprenantoj"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Partoprenanto"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Vizitantoj"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Vizitanto"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Mastro"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administristo"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "atentas al la komunikado"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "faras ion alian"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "tajpas mesaĝon..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "paŭzas tajpi mesaĝon"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aŭ slipon"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Sendi mesaĝon"
 msgstr[1] "Sendi mesaĝon"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5250,11 +5298,11 @@ msgstr "%s ne estas valida protokola detalnivelo"
 msgid "error: cannot open %s for reading"
 msgstr "eraro: %s nedisponeblas por legi"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "blua"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "indeksigas protokolan datumbazon"
 
@@ -5975,13 +6023,13 @@ msgstr ""
 "estos nuligita."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5990,15 +6038,27 @@ msgstr ""
 "La servilnomo, specifita de vi en la agordero \"ft_override_host_to_send\" "
 "de la detala agordo, ne ekzistas aŭ malkorektas, tial estas ignorata."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP-pasfrazo ne estis donita"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Vi estos konektita al %s sen OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Por plu sendi kaj ricevi mesaĝojn, vi bezonas rekonekti."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Eraro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -6007,32 +6067,32 @@ msgstr ""
 "%s\n"
 "Lig-loka komunikado ne povas funkcii korekte."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Ne povas lanĉi lokan servon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Neeblas aliĝi al pordo %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ne povas ŝanĝi staton de konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -6040,21 +6100,21 @@ msgstr ""
 "Vi estas senkonekta aŭ nevidebla por aliaj. Via mesaĝo ne estis sendita."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
@@ -6065,26 +6125,26 @@ msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
 msgid "Error while adding service. %s"
 msgstr "eraro dum aldonado de servo %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "malŝaltitaj"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Defaŭlta statmesaĝo"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Ebligi"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6093,208 +6153,214 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Ĉu rekonektu nun?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se vi volas ekuzi la ĉiujn ŝanĝojn, vi devas rekonekti."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Nelegitaj eventoj"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "Por ŝanĝi la nomon de konto, vi devas legi atendantajn eventojn."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "Administri kontojn"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Bonvolu renomigi aŭ forigi ĝin antaŭ ebligi lig-lokan komunikadon."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6302,11 +6368,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6314,11 +6380,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6326,11 +6392,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6338,7 +6404,7 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6355,58 +6421,58 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "Ĉiujn"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Nur en/el-iradojn"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "Neniujn"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6414,69 +6480,68 @@ msgstr ""
 "tiun ĉi legosignon."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Kaŝnomo malpermesita: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Vi povas agordi kromajn kontajn parametrojn alklakinte la butonon \"Krome\" "
 "aŭ pli poste menueron Kontoj en menuo Administri de la ĉefa fenestro."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6486,7 +6551,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6494,72 +6559,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "GMail-retletero venis"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6568,75 +6633,75 @@ msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Eliri"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Vortara URL ne enhavas \"%s\" kaj ĝi ne estas WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "Antaŭ %i tagoj"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-tujmesaĝilo"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6672,126 +6737,126 @@ msgstr "Kontaktnomo"
 msgid "Set Mood"
 msgstr "Enigi tagmesaĝon"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Mesaĝo por la stato \"%s\""
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Konservi kiel antaŭpreparita statmesaĝo"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Bonvolu tajpi nomon de tiu statmesaĝo"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM-adreso:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG numero:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ numero:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN-adreso:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo-adreso:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni ĉe konto %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Malkorekta uzula ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "La uzula ID devas ne enteni risurcon."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Uzula ID:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber-kliento"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Versio de GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Versio de PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Nunaj programistoj:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Ĝisnunaj programistoj:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "DANKON AL:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Fine ne malpli ol aliajn ni dankas ĉiujn pakaĵvartistojn."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6802,93 +6867,103 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Demando pri abono por konto %s de %s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Eniri en babilejon per konto %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Malkorekta kontnomo"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Tio ne estas babilejo"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ne estas la nomo de babilejo."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Servilo"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Babili per konto %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Babili"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6897,301 +6972,301 @@ msgstr ""
 "al kiu vi volas sendi mesaĝon:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Neeblas analizi \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Vi devas enigi pasvorton."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakto ensalutis"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nova mesaĝo"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nova unuobla mesaĝo"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Mi estas %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konzolo por %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML-konzolo"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr "Aldoni"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Korekti"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber-ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privata listo <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privata listo por %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordnumero: %s, ago: %s, tipo: %s, valoro: %s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordnumero: %s, ago: %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privataj listoj por %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Malkorekta listnomo"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Elektu sonon"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kiam %s venas:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "n°"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Kondiĉo"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "dum mi estas "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7199,38 +7274,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7240,26 +7315,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7354,20 +7429,20 @@ msgstr "Priskribo"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Legosigno jam estas metita"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Legosigno sukcese aldonitas"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Vi povas aranĝi viajn legosignojn per menuero \"Agoj\" en la kontaktlisto."
@@ -7381,15 +7456,15 @@ msgstr "Abonita"
 msgid "Node"
 msgstr "Neniu"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Nova mesaĝo"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
@@ -7830,31 +7905,31 @@ msgstr "Gajim bezonas X-servilon. Finas..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim bezonas GTK 2.8 aŭ pli novan"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim bezonas GTK 2.8 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Mankas subteno de libglade en GTK+"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7863,22 +7938,22 @@ msgstr ""
 "Bonvolu forigi vian nuntempan GTK+ bibliotekon kaj instali la plej lastan "
 "stabilan version de %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Bonvolu kontroli ke GTK+ kaj PyGTK en via sistemo subtenas la bibliotekon "
 "libglade."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim bezonas PySqlITE2 por funkcii"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim bezonas pywin32 por funkcii"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7888,11 +7963,11 @@ msgstr ""
 "povas preni ĝin ĉe %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim jam estas lanĉita"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7900,34 +7975,34 @@ msgstr ""
 "Alia ekzemplero de Gajim ŝajne estas lanĉita\n"
 "Ĉu lanĉu malgraŭ tio?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Vi estos konektita al %s sen OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Malprava pasfrazo"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7937,165 +8012,171 @@ msgstr ""
 "Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
 "Bonvolu specifi alian kaŝnomon jene:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "eraro dum sendado %s ( %s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Mendo de abono"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "La kontakto \"%s\" permesas al vi vidi lian aŭ ŝian staton."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Malaboni"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakto kun \"%s\" neestableblas"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s nomiĝas %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Necesas pasvorto por aliĝi al la babilejo."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Via pasfrazo estas malvalida"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Ne plu demandi"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8104,19 +8185,19 @@ msgstr ""
 "Gnoma ŝlosilaro (Gnome Keyring) instalitas sed ne estas korekte lanĉita "
 "(medivariablo eble ne korekte valorizitas)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nova retletero ĉe %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Vi havas %d novan retleteron"
 msgstr[1] "Vi havas %d novajn retleterojn"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8126,92 +8207,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "La dosiero %(filename)s de %(name)s estas sukcese ricevita."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vi sukcese sendis %(filename)s al %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En ĉ_iu mesaĝo"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8219,15 +8300,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8238,63 +8319,63 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konekto"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
@@ -8328,12 +8409,13 @@ msgstr ""
 "separata lineo"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "konto"
 
@@ -8359,9 +8441,9 @@ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "mesaĝo"
 
@@ -8379,22 +8461,47 @@ msgstr ""
 "komuna stato\""
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Ŝanĝas staton de konto aŭ kontoj"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_tato:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Mi volas registri novan konton"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"ŝanĝas staton de konto \"account\". Se ne estas specifita, provas ŝanĝi "
+"statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
+"komuna stato\""
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Montras interparolan fenestron do vi povas sendi mesaĝon al kontakto"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Se specifita, kontakto estos prenata el kontaktlisto de tiu ĉi konto"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8404,29 +8511,29 @@ msgstr ""
 "kaj konto estas fakultativaj. Se vi volas specifi nur konton sen OpenPGP-"
 "ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "PGP-ŝlosilo"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Se specifita, la mesaĝo estos ĉifrita per tiu ĉi publika ŝlosilo"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "Se specifita, la mesaĝo estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8436,134 +8543,134 @@ msgstr ""
 "ŝlosilo kaj konto estas fakultativaj. Se vi volas specifi nur konton sen "
 "OpenPGP-ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "temo"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "temo de mesaĝo"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Ricevas detalan informon pri kontakto"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID de la kontakto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Ricevas detalan informon pri konto"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nomo de la konto"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "dosiero"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Dosierindiko"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "Se specifita, dosiero estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Listo de ĉiuj parametroj kaj ilia valoroj"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Valorigi \"ŝlosilo\" per \"valoro\"."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ŝlosilo=valoro"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "\"ŝlosilo\" estas nomo de parametro, \"valoro\" estas ĝia stato"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Forigas parametron"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ŝlosilo"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nomo de forigota parametro"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skribas la aktualan agordon de Gajim en la dosieron \".config\""
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Aligas kontakton en kontaktliston"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Aldonas novan kontakton en tiun konton"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Donas nuntempan staton (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Donas nuntempan statmesaĝon (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Donas kvanton de nelegitaj mesaĝoj"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Malfermi \"Ekparoli\" dialogfenestron"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Babili per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Sendi propran XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML por sendi"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8571,77 +8678,77 @@ msgstr ""
 "Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
 "kontoj"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Prilabori xmpp:/ uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Aliĝi al MUC-babilejo"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "babilejo"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Babilejo:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "kaŝnomo"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "pasvorto:"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Pasvortoj diversas"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8650,31 +8757,31 @@ msgstr ""
 "%s mankas en via kontaktlisto\n"
 "Bonvolu specifi konton por sendi la mesaĝon."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Vi ne havas aktivan konton"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumentoj:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s ne trovitas"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8683,7 +8790,7 @@ msgstr ""
 "Uzado: %s komando [argumentoj]\n"
 "Komando estas unu el:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8692,7 +8799,7 @@ msgstr ""
 "Tro multe da argumentoj. \n"
 "Enigu \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8701,7 +8808,7 @@ msgstr ""
 "Argumento \"%s\" ne estas specifita. \n"
 "Enigi \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Malprava uri"
 
@@ -8731,310 +8838,174 @@ msgstr "Vi ne povas forigi aktivan etoson"
 msgid "Please first choose another for your current theme."
 msgstr "Bonvolu komence aktivigi alian etoson."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Vi ne plu ĉeestas en babilejo \"%s\" aŭ \"%s\" foriris."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historio de interparoloj"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konekto"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Aliĝo de %(nick)s nun estas malpermesa: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Aliĝo de %(nick)s estas malpermesita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aparteneco:"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Kaŝnomo ne trovitas: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Tiu ĉi babilejo ne havas temon"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s invititas al %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Kaŝnomo ne trovitas: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Uzado: /%s <kaŝnomo|JID> [kialo], malpermesas, ke la JID aliĝi al la "
-"babilejo. Eblas uzi la kaŝnomon de uzulo, sed ne se ĝi entenas \"@\" aŭ "
-"spaceton. Se la JID ĉeestas en la babilejo, tiu estos ankaŭ elpelita."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
-"specifita persono."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Uzado: /%s [kialo], - fermas la nuntempan fenestron aŭ slipon, informe pri "
-"kialo se specifita."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Uzado: /%s <JID> [kialo], - invitas JID al la nuntempa babilejo, fakultative "
-"informante pri kialo."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Uzado: /%s <babilejo>@<servilo>[/kaŝnomo], - aliĝas al room@server "
-"fakultative uze specifitan kaŝnomon."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Uzado: /%s <kaŝnomo> [kialo], - forigas la uzulon specifitan per kaŝnomo el "
-"la babilejo kaj fakultative montras kialon. NE SUBTENAS spacetojn en kaŝnomo."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Uzado: /%s <kaŝnomo> [mesaĝo], malfermas privatan mesaĝan fenestron kaj "
-"sendas mesaĝon al la uzulo specifita per kaŝnomo."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Uzado: /%s <kaŝnomo>, ŝanĝas vian kaŝnomon en nuntempa babilejo."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Uzado: /%s , - eligas la nomoj de babilejaj ĉeestantoj."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Uzado: /%s [temo], - eligas aŭ novigas la nuntempan babilejan temon."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Uzado: /%s <mesaĝo>, - sendas mesaĝon preter rekonado de aliaj komandoj."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Uzado: /%s <kaŝnomo>, ŝanĝas vian kaŝnomon en nuntempa babilejo."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se vi fermos tiun fenestron, vi senkonektiĝos de tiu ĉi babilejo."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Priskribo: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
@@ -9105,6 +9076,15 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Konservi bildon kiel..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Nova babilejo"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Mi volus aldoni vin en mian kontaktliston"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Ne povas trovi datumbazon de protokoloj"
@@ -9186,53 +9166,62 @@ msgstr "Historio de interparolo kun %s"
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s nun estas %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Erara mesaĝo: %s"
+
+#: ../src/history_window.py:440
+msgid "Error"
+msgstr ""
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Mesaĝoj"
 
@@ -9293,12 +9282,12 @@ msgstr "naŭ"
 msgid "Retrieving profile..."
 msgstr "Obtenas vizitkarton..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "Dosierindiko"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tiu babilejo ne ekzistas."
@@ -9306,7 +9295,7 @@ msgstr "Tiu babilejo ne ekzistas."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
@@ -9336,46 +9325,46 @@ msgid ""
 "later."
 msgstr "Estis eraro dum publicado de persona informo, provu denove pli poste."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Permeso estas sendita"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" akceptas tiun peton vi povos koni lian aŭ ŝian staton."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Permeso estas forigita"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9383,44 +9372,44 @@ msgstr ""
 "Ŝanĝo de via stato per nevidebla okazigos diskonektadon de tiuj babilejoj. "
 "Ĉu vi certas ke vi volas iĝi nevidebla?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "Mesaĝoj disponeblos por legi ĝin poste nur se vi ŝaltis historion."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9428,11 +9417,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9441,58 +9430,69 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiuj ĉi "
 "transportiloj:%s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Renomigado de kontakto"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enigu novan kaŝnomon por kontakto %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Renomigi grupon"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Forigi grupon"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ĉu vi volas forigi la grupon %s de la kontaktlisto?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Forigi ankaŭ ĉiujn kontaktojn de la grupo el via kontaktlisto"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9501,12 +9501,12 @@ msgstr ""
 "vidos vin kiel senkonekta."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9514,16 +9514,16 @@ msgstr ""
 "Forigante tiu ĉi konton vi defaŭlte ankaŭ forigas permeson pro kio li aŭ ŝi "
 "ĉiam vidos vin senkonekta."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Permesi al tiu ĉi konto koni mian staton post forigado"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9532,19 +9532,32 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9553,12 +9566,12 @@ msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9568,24 +9581,24 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Malkorekta dosiero"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s volas sendi al vi dosieron:"
 msgstr[1] "%s volas sendi al vi dosieron:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Sendi %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
@@ -9595,123 +9608,134 @@ msgstr "Igi %s kaj %s metakontaktoj"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "per konto %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "al konto %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "per konto %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Aranĝi _legosignojn..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "de konto %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "por konto %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publici"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Serĉi servojn..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Sendi _grupan mesaĝon"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Al ĉiuj uzantoj"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Al ĉiuj konektitaj uzantoj"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Mi volus aldoni vin en mian kontaktliston"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomigado de kontakto"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Aranĝi _Grupojn"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Sendi unuopan mesaĝon"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Plenumi komandon..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportiloj"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Montri Trans_portilojn"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Renomigi"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "Kontakto malkonektita"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "Nova babilejo"
+msgid "_Disconnect"
+msgstr "Kontakto malkonektita"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Ŝanĝi statmesaĝon..."
 
@@ -9728,20 +9752,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Temo: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9751,7 +9775,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9942,6 +9966,128 @@ msgstr ""
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Aligi specialan _avizon"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Enigi Open_PGP-ŝlosilon"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Komandoj: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s "
+#~ "eksplodas)."
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "helpinformo mankas por /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Ebligi lig-lokan/zerokonf komunikadon"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Kaŝnomo ne trovitas: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Tiu ĉi babilejo ne havas temon"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s invititas al %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Kaŝnomo ne trovitas: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Uzado: /%s <kaŝnomo|JID> [kialo], malpermesas, ke la JID aliĝi al la "
+#~ "babilejo. Eblas uzi la kaŝnomon de uzulo, sed ne se ĝi entenas \"@\" aŭ "
+#~ "spaceton. Se la JID ĉeestas en la babilejo, tiu estos ankaŭ elpelita."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
+#~ "specifita persono."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Uzado: /%s [kialo], - fermas la nuntempan fenestron aŭ slipon, informe "
+#~ "pri kialo se specifita."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Uzado: /%s <JID> [kialo], - invitas JID al la nuntempa babilejo, "
+#~ "fakultative informante pri kialo."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Uzado: /%s <babilejo>@<servilo>[/kaŝnomo], - aliĝas al room@server "
+#~ "fakultative uze specifitan kaŝnomon."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Uzado: /%s <kaŝnomo> [kialo], - forigas la uzulon specifitan per kaŝnomo "
+#~ "el la babilejo kaj fakultative montras kialon. NE SUBTENAS spacetojn en "
+#~ "kaŝnomo."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Uzado: /%s <kaŝnomo> [mesaĝo], malfermas privatan mesaĝan fenestron kaj "
+#~ "sendas mesaĝon al la uzulo specifita per kaŝnomo."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Uzado: /%s <kaŝnomo>, ŝanĝas vian kaŝnomon en nuntempa babilejo."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Uzado: /%s , - eligas la nomoj de babilejaj ĉeestantoj."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Uzado: /%s [temo], - eligas aŭ novigas la nuntempan babilejan temon."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Uzado: /%s <mesaĝo>, - sendas mesaĝon preter rekonado de aliaj komandoj."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Uzado: /%s <kaŝnomo>, ŝanĝas vian kaŝnomon en nuntempa babilejo."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Klaku por vidi trajtojn (kiel MSN, ICQ transportiloj) de jabber-serviloj"
diff --git a/po/es.po b/po/es.po
index bbc73be8b..8de42b210 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:49+0200\n"
 "Last-Translator: Membris Khan <frank@giingo.org>\n"
 "Language-Team: none <>\n"
@@ -211,6 +211,7 @@ msgstr "<b>Información personal</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Cuenta"
 
@@ -278,8 +279,8 @@ msgstr "_Editar información personal personales..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -290,8 +291,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "General"
 
@@ -351,25 +352,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Información acerca de tí a guardar en el servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ninguno"
 
@@ -529,8 +526,8 @@ msgstr ""
 "firewall."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
@@ -544,7 +541,7 @@ msgid "Mer_ge accounts"
 msgstr "_Combinar las cuentas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Re_nombrar"
 
@@ -805,7 +802,7 @@ msgid "All statuses"
 msgstr "Todos los estados"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Ausente"
 
@@ -822,7 +819,7 @@ msgid "Have "
 msgstr "Tiene "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -831,7 +828,7 @@ msgid "Launch a command"
 msgstr "Lanzar un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "No disponible"
 
@@ -1018,7 +1015,7 @@ msgid "Join _Group Chat"
 msgstr "Entrar a un grupo de charla"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Añadir al roster"
 
@@ -1044,39 +1041,6 @@ msgstr "_Abrir enlace en navegador"
 msgid "_Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Invitar _Contactos"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Enviar archivo"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Alternar cifrado End to End"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Alternar cifrado OpenPGP"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Añadir a la lista de contactos"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Histórico"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "In_vitar"
@@ -1101,6 +1065,119 @@ msgstr ""
 "Vas a comenzar una conversación multiusuario.\n"
 "Selecciona los contactos a invitar"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Pregunta para ver _su estado"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Añadir _notificación especial..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Asignar clave Open_PGP..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Ejecutar comando..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Editar _grupos..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "In_vitar a"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Invitar _Contactos"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "_Eliminar"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Envía estado personalizado"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Enviar mensaje..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Enviar _archivo"
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Definir _Avatar personalizado..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Iniciar conversación"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Alternar cifrado End to End"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Alternar cifrado OpenPGP"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "Permitirle ver mi estado"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Bloquear"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "Prohibirle ver mi estado"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Histórico"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignorar"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Gestionar contacto"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Renombrar..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Subscripción"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Desbloquear"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_No ignorar"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Rellenar el formulario."
@@ -1221,7 +1298,7 @@ msgstr ""
 "Contacto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Negrita"
 
@@ -1245,7 +1322,7 @@ msgstr "Me fui"
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Cursiva"
 
@@ -1317,6 +1394,14 @@ msgstr "Mo_derador"
 msgid "Occupant Actions"
 msgstr "Acciones de ocupante"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Enviar archivo"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Añadir a la lista de contactos"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administrar"
@@ -1325,13 +1410,6 @@ msgstr "_Administrar"
 msgid "_Ban"
 msgstr "_Banear"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Bloquear"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Expulsar"
@@ -1348,13 +1426,6 @@ msgstr "_Propietario"
 msgid "_Send Private Message"
 msgstr "_Enviar mensaje privado"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Desbloquear"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voz"
@@ -1363,7 +1434,7 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Crear nuevo post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "De"
 
@@ -1388,8 +1459,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Bienvenido al gestor de históricos de Gajim</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1442,34 +1513,39 @@ msgstr "Buscar"
 msgid "_Log conversation history"
 msgstr "Histórico de conversaciones"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Añadir este salón a marcadores (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Entrar en este salón automáticamente al conectarme"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Alias:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Contraseña: "
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Recientemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Salón:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Entrar"
@@ -1498,7 +1574,7 @@ msgstr "Minimizar al ingresar automáticamente"
 msgid "Print status:"
 msgstr "Mostrar estado:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -2038,7 +2114,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Estado"
 
@@ -2205,34 +2281,39 @@ msgid "All"
 msgstr "Todos"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "todos por suscripción"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "ID de Jabber:"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Orden:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Lista de privacidad"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "todos por suscripción"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "todos en el grupo"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2244,19 +2325,19 @@ msgstr ""
 "de\n"
 "a"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "para enviarme mensajes"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "para enviarme consultas"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "para enviarme el estado"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "para ver mi estado"
 
@@ -2424,96 +2505,11 @@ msgstr "Eliminar la cuenta de Gajim y del _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Pregunta para ver _su estado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Añadir _notificación especial..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Asignar clave Open_PGP..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Editar _grupos..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Ejecutar comando..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "In_vitar a"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "_Eliminar"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Envía estado personalizado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Enviar mensaje..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Enviar _archivo"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Definir _Avatar personalizado..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Iniciar conversación"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "Permitirle ver mi estado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "Prohibirle ver mi estado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignorar"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Gestionar contacto"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Renombrar..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Subscripción"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_No ignorar"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2634,7 +2630,7 @@ msgid "_Add contact"
 msgstr "Añadir un _Contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Información"
 
@@ -2849,26 +2845,6 @@ msgstr "_Mensaje"
 msgid "_Presence"
 msgstr "_Presencia"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Añadir _notificación especial"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Asignar clave OpenPGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Editar grupos"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "Renombrar"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modificar cuenta..."
@@ -2912,48 +2888,48 @@ msgid "Service returned an error."
 msgstr "El servicio devolvió un error"
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Activado"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Desactivado"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Entero"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Color"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Nombre de la opción"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Ninguno)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Oculta"
 
@@ -2967,188 +2943,187 @@ msgstr "Has recibido una nueva entrada:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Inglés"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Bieloruso"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Griego"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Británico"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Euskera"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Francés"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Noruego (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Portugués de Brasil"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Chino (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Lenguaje del corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Tu mensaje no será enviado mientras no estés conectado."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Indefinido"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Servicio"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Fuente:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Información"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "¿Enviar fichero?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Si envías un archivo a %s, el/ella sabrá tu ID de Jabber real."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "Cifrado GPG habilitado"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "no está en el roster"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Una lista de transferencias activas, finalizadas y detenidas"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Artista desconocido"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Título desconocido"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Recurso desconocido"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3157,17 +3132,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s del salón %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Ninguna clave GPG asignada"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3175,50 +3150,50 @@ msgstr ""
 "No se ha asignado ninguna clave GPG a este contacto. Por tanto no podrás "
 "cifrar mensajes con GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "Cifrado GPG deshabilitado"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "La sesión SERÁ registrada"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "La NO SERÁ registrada"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "es"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "NO es"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "no será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "y autentificado"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "y NO autenticado"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3227,66 +3202,23 @@ msgstr ""
 "%(type)s cifrado %(status)s activo %(authenticated)s.\n"
 "Tu sesión %(logged)s guardada."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Comando no soportado por la cuenta zeroconf."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Comandos: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uso: /%s, limpia de texto la ventana."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uso: /%s, oculta los botones de conversación."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Uso: /%(command)s <action>, envía action al actual grupo de charla. Usa una "
-"tercera persona (p.ej. /%(command)s explota.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Uso: /%s, envía un ping al contacto"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Uso: /%s, envía el mensaje al contacto"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "No hay información de ayuda para /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "La negociación de la sesión ha sido cancelada"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Esta sesión está cifrada"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " y SERÁ registrada"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " y NO SERÁ registrada"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3294,25 +3226,25 @@ msgstr ""
 "No se verificó la identidad del contacto remoto. Click en el botón del "
 "escudo para más detalles."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "Cifrado E2E desactivado"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "El siguiente mensaje NO fue cifrado"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "El siguiente mensaje fue cifrado"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3320,15 +3252,15 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Error en la base de datos"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3337,7 +3269,7 @@ msgstr ""
 "No se pudo leer el archivo de base de datos (%s). Intenta repararlo o "
 "elimínalo (se perderá todo el histórico)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s está ahora %(status)s"
@@ -3346,23 +3278,23 @@ msgstr "%(name)s está ahora %(status)s"
 msgid "creating logs database"
 msgstr "creando base de datos de registros"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s es un archivo pero podría ser un directorio"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrará ahora"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s es un directorio pero podría ser un archivo"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "creando directorio %s"
@@ -3426,9 +3358,9 @@ msgstr "Elige los grupos de conversación que quieres abandonar"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
@@ -3444,73 +3376,114 @@ msgstr "Reenviar mensajes sin leer"
 msgid "All unread messages have been forwarded."
 msgstr "Todos los mensajes sin leer han sido reenviados"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus y el demonio notificador para mostrar notificaciones"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tiempo en minutos, después de haber cambiado a ausente"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Ausente por estar inactivo más de $T minutos)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S será reemplazado por el mensaje de estado actual, $T por tiempo de auto-"
 "ausencia"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tiempo en minutos, después de haber cambiado a no disponible"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (No disponible por estar inactivo más de $T minutos)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S será reemplazado por el actual mensaje de estado, $T por tiempo de auto-"
 "ausencia extendida"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Alias no válido"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "texto del mensaje de estado"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Alias no válido"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Cambiando alias"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "texto del mensaje de estado"
+
 # duda sobre collapsed
-#: ../src/common/config.py:99
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (separada por espacios) de filas (cuentas y grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "por defecto"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Habilitar mensajería de enlace local / zeroconf"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Lenguaje usado por el corrector"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3520,7 +3493,7 @@ msgstr ""
 "'a veces' - muestra la hora cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca muestra la hora."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3530,18 +3503,18 @@ msgstr ""
 "a 4, o 0 para deshabilitar el reloj hablado. 1 es el reloj más preciso, 4 el "
 "menos. Sólo se usa si print_time está definido como 'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratar los pares de * / _ como posibles caracteres de formateo."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si es True, no elimiina */_ . Entonces *abc* será negrita, pero sin eliminar "
 "* *"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3552,7 +3525,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (If you want to use this, install "
 "docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3560,7 +3533,7 @@ msgstr ""
 "Carácter a añadir tras el alias cuando se usa completado de alias (tab) en "
 "los grupos de charla."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3568,7 +3541,7 @@ msgstr ""
 "Carácter a proponer para añadir tras el alias deseado cuando el alias "
 "deseado está siendo usado por alguien en el grupo de charla."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3579,19 +3552,19 @@ msgstr ""
 "de Python acerca de strftime y para más detalles: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Los caracteres que se imprimen antes del alias en las conversaciones"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Los caracteres que se imprimen después del alias en las conversaciones"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "¿Añadir * y [n] en el título del roster?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3599,12 +3572,26 @@ msgstr ""
 "Cuántas líneas recordar de la última conversación cuando se vuelve a abrir "
 "una pestaña/ventana de conversación"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Cuántos minutos debe durar la última línea de la conversación anterior."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3612,11 +3599,11 @@ msgstr ""
 "Envía un mensaje con Ctrl+Intro y con Intro hace un nuevo renglón (Al estilo "
 "del cliente Mirabilis ICQ)"
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cuántas líneas almacenar para Ctrl+Arriba."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3625,12 +3612,12 @@ msgstr ""
 "URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
 "significa usar wiktionary"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si está marcado, Gajim puede ser controlado remotamente usando gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3642,13 +3629,13 @@ msgstr ""
 "puesto en False y sincronicen con el estado global) basados en el estado de "
 "la conexión de la red."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3656,7 +3643,7 @@ msgstr ""
 "Las notificaciones de estado mostradas en las ventanas de conversación. "
 "Pueden ser all, composing_only o disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3664,11 +3651,11 @@ msgstr ""
 "Cuando no se muestra la hora en cada mensaje (print_time==sometimes), la "
 "muestra cada x minutos."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3676,7 +3663,7 @@ msgstr ""
 "Preguntar siempre antes de cerrar la ventana/pestaña de un grupo de charla "
 "en esta lista (separada por espacios) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3685,13 +3672,13 @@ msgstr ""
 "conversación en esta lista (separada por espacios) de ID de Jabber de grupos "
 "de charla."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3700,27 +3687,27 @@ msgstr ""
 "locales, para las transferencias de archivos en caso redirección de puerto o "
 "interpretación de la dirección."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Según el estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Notifica eventos en el área de notificación."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "¿Mostrar borde solapado de archivador en las ventanas de conversación?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "¿Mostrar botón de cerrar en la pestaña?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3732,18 +3719,18 @@ msgstr ""
 "válidos. Los números más altos son los más seguros pero demoran más tiempo "
 "en el cálculo cuando inicias una sesión."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "¿Previsualizar nuevos mensajes en un mensaje emergente?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Una lista de palabras separadas por ';' que serán resaltadas en los grupos "
 "de charla."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3752,14 +3739,14 @@ msgstr ""
 "pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
 "notificación. "
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Si es True, Gajim comprueba si es el cliente Jabber por defecto en cada "
 "inicio."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3767,7 +3754,7 @@ msgstr ""
 "Si es True, Gajim mostrará un icono en cada pestaña que contenga mensajes "
 "sin leer. Dependiendo del tema, este icono puede ser animado."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3775,12 +3762,12 @@ msgstr ""
 "Si es True, Gajim mostrará el mensaje de estado, si no está vacío, para cada "
 "contacto bajo su nombre de contacto en ela ventana del roster."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definir la posición del avatar en el roster. Puede ser izquierda o derecha"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3788,7 +3775,7 @@ msgstr ""
 "Si es True, Gajim pedirá un avatar a cada contacto que no tuvo un avatar la "
 "última vez o se tiene guardado uno demasiado antiguo."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3796,7 +3783,7 @@ msgstr ""
 "Si es False, Gajim nunca más mostrará la línea de estado cuando un contacto "
 "cambie su estado o su mensaje de estado"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3810,30 +3797,30 @@ msgstr ""
 "mensajes de estado. Si es \"in_and_out\", Gajim sólo mostrará las entradas y "
 "salidas en el grupo de conversación."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Color de fondo para los contactos que acaban de conectar."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Color de fondo para los contactos que acaban de desconectar."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Si es True, los mensajes restaurados usarán una fuente más pequeña que la "
 "predefinida."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "No mostrar avatar para el transporte en sí mismo"
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "No mostrar roster en la barra de tareas."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3842,7 +3829,7 @@ msgstr ""
 "Si es True y las versiones instaladas de GTK+ y PyGTK son al menos 2.8, hace "
 "a la ventana resaltarse cuando se tienen eventos pendientes."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3853,7 +3840,7 @@ msgstr ""
 "detener el envío de información sha en el grupo de conversación."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3873,31 +3860,31 @@ msgstr ""
 "'pertype' - Cada tipo de mensaje (p.ej. conversaciones vs. grupos de charla) "
 "se envian a una ventana específica."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Si es False, no verás más el avatar en la ventana de conversación."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Si es True, presionar la tecla escape cierra una ventana/pestaña."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Esconde los botones en las ventanas de conversación"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Oculta el banner en una ventana de grupo de charla"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Oculta el banner en una ventana de conversación de dos personas."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Oculta los ocupantes en las ventans de grupo de charla."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3905,15 +3892,15 @@ msgstr ""
 "En una conversación, muestra el alias al principio de una línea sólo cuando "
 "no es la misma persona que envió el último mensaje."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentar cuando se use una combinación de alias consecutivos."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Desplazamiento suave del mensaje en las ventanas de conversación"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3921,13 +3908,13 @@ msgstr ""
 "Lista de colores, separados por \":\", que serán usados para colorear alias "
 "en los grupos de charla."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab conduce a la próxima pestaña de composición cuando ninguno está sin "
 "leer."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3935,7 +3922,25 @@ msgstr ""
 "¿Debemos mostrar la confirmación de la creación de metacontactos o no? Una "
 "secuencia vacía significa que nunca se mostrará."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"¿Debemos mostrar la confirmación de la creación de metacontactos o no? Una "
+"secuencia vacía significa que nunca se mostrará."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"¿Debemos mostrar la confirmación de la creación de metacontactos o no? Una "
+"secuencia vacía significa que nunca se mostrará."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3945,7 +3950,7 @@ msgstr ""
 "ventana de modificación de cuenta. TEN CUIDADO, cuando estás conectado con "
 "una prioridad negativa, NO recibirás ningún mensaje de tu servidor."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3953,7 +3958,7 @@ msgstr ""
 "Si es True, Gajim usará Gnome Keyring (si está disponible) para almacenar "
 "las contraseñas de la cuenta."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3962,7 +3967,7 @@ msgstr ""
 "Si es True, Gajim usará Gnome Keyring (si está disponible) para almacenar "
 "las contraseñas de la cuenta."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3970,7 +3975,7 @@ msgstr ""
 "Si es True, Gajim mostrará el número de contactos totales y en línea en los "
 "títulos de la cuenta y los grupos."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3978,7 +3983,7 @@ msgstr ""
 "Puede estar vacío, 'chat' o 'normal. Si no está vacío, tratará todos los "
 "mensajes entrantes como si fueran de este tipo"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3986,7 +3991,7 @@ msgstr ""
 "Si es True, Gajim mostrará y seleccionará el contacto que te envió el último "
 "mensaje, si la ventana de conversación no ha sido abierta aún."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3994,11 +3999,11 @@ msgstr ""
 "Si es True, Gajim convertirá la cadena entre $$ y $$ a una imagen usando "
 "dvips y convert antes de insertarla en una ventana de conversación."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tiempo de inactividad necesario antes de cerrar la ventana de estado."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4006,7 +4011,7 @@ msgstr ""
 "Número máximo de líneas mostradas en las conversaciones. Las más antiguas "
 "serán limpiadas."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4014,11 +4019,11 @@ msgstr ""
 "Si es True, las ventanas de notificación del deminio notificador serán "
 "adjuntadas al área de notificación."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Elige intervalo entre 2 comprobaciones de inactividad."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4026,7 +4031,7 @@ msgstr ""
 "Cambiar el valor para cambiar el tamaño de las fórmulas latex visualizadas. "
 "El mayor es el más grande."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4035,13 +4040,23 @@ msgstr ""
 "Combinaciones de uri válidas. Sólo las combinaciones de esta lista serán "
 "aceptadas como uri \"real\"."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4049,7 +4064,7 @@ msgstr ""
 "La prioridad cambiará automáticamente acorde a tu estado. Las prioridades "
 "están definidas en las opciones de autoprioridad_*"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4058,27 +4073,38 @@ msgstr ""
 "invisible. NOTA: esta opción se usa sólo si restore_last_status está "
 "desactivado"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Si está activado, restaurar el último estado que fue usado"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Si es False, no verás más el avatar en la ventana de conversación."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Si está desactivado, no firmar presencias con la clave GPG, incluso si GPG "
 "está configurado."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Activar cifrado ESessions para esta cuenta."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "¿Gajim debería iniciar automáticamente una sesión cifrada cuando sea posible?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4086,30 +4112,30 @@ msgstr ""
 "Lista ordenada (separada por espacios) de tipos de conexión para probar. "
 "Puede contener tls, ssl o plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
 "texto plano."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Muestra un aviso antes de usar la librería SSL estándar"
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espacios de errores ssl a ignorar."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4119,11 +4145,11 @@ msgstr ""
 "actividad antes de  intentar reconectar."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4131,15 +4157,15 @@ msgstr ""
 "Si está marcado, Gajim usará tu IP y proxies definidos en la opción "
 "file_transfer_proxies para tu transferencia."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Contestar peticiones recibidas"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Enviar peticiones recibidas"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4147,11 +4173,11 @@ msgstr ""
 "Cuando se negocie una sesión cifrada, ¿Gajim debería asumir que quieres que "
 "tus mensajes sean registrados?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "¿Está OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4159,101 +4185,101 @@ msgstr ""
 "¿Debería Gajim iniciar automáticamente una sesión cifrada con este contacto "
 "cuando sea posible?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "estado separado por espacios o all"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' o 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' o ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Estoy fuera disfrutando la vida"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Estoy disponible"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Estoy libre para hablar"
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "No estoy disponible."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "No molestar."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "¡Adiós!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4262,99 +4288,99 @@ msgstr ""
 "palabras de muc_highlight_words, o cuando un mensaje de grupo de charla "
 "contiene tu alias."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "No se puede cargar el módulo idle"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Host erróneo"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "¿Dirección local no válida? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "La información de registro para el transporte %s no llegó a tiempo"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard publicada con éxito"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "falló la publicación de la vCard"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Error de escritura en disco"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Invisibilidad no soportada"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "La cuenta %s no soporta invisibilidad."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4364,77 +4390,84 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) o elimínalo (se perderá todo el "
 "histórico)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alias no permitido: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "No se pudo entrar al grupo de charla"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Estás baneado del grupo de charla %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "El grupo de charla %s no existe."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "La creación de grupos de charla está restringida."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Tu alias registrado podría estar en uso en el grupo de charla %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "No estás en la lista de miembros del grupo de charla %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "El salón ha sido destruido"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Puedes unirte a este salón en su lugar: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos ahora suscritos a %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "petición de eliminación de suscripción de %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ya no estamos suscritos a %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4444,223 +4477,209 @@ msgstr ""
 "herramientas de gestión del roster como http://jru.jabberstudio.org/ para "
 "eliminarlo"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "No se ha facilitado la clave OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Te conectarás a %s sin OpenPGP"
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "No se puede obtener el certificado del emisor"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "No se puede obtener el certificado CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "No se puede descifrar la firma del certificado"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "No se puede descifrar la firma del CRL"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "No se puede decodificar la clave pública del emisor"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Fallo en la firma del certificado"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Fallo en la firma CRL"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "El certificado todavía no es válido"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "El certificado ha expirado"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "El CRL todavía no es válido"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "El CRL ha expirado"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Error de formato en el campo notBefore del certificado"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Error de formato en el campo notAfter del certificado"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Error de formato en el campo lastUpdate del CRL"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Error de formato en el campo nextUpdate del CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Memoria llena"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Certificado autofirmado"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado autofirmado en la cadena del certificado"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "No se puede obtener el certificado del emisor local"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "No se puede verificar el primer certificado"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "La cadena del certificado es demasiado larga"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Certificado revocado"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Certificado CA no válido"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "La longitud de la ruta excedió el límite"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Propósito de certificado no soportado"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "El certificado no es de confianza"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Certificado rechazado"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "El emisor del asunto no coincide"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "La autoridad y el asunto de la clave identificadora no coinciden"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "La autoridad y el número de serie del emisor no coinciden"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "El uso de la clave no incluye la firma de certificados"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Falló la verificación de la aplicación"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Se ha perdido la conexión de la cuenta \"%s\""
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "El servidor %(name)s contestó incorrectamente a la petición de registro: %"
 "(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "El servidor %s provee un formulario de registro diferente"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Error SSL desconocido: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Respuesta no válida"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "El transporte %(name)s respondió incorrectamente a la petición de registro: %"
 "(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Guardado en: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Falló la conexión al proxy"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "No se puede conectar a la cuenta %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Se perdió la conexión con la cuenta %s. Reintentando la conexión."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "La autenticidad del certificado %s podría no ser válida."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4669,7 +4688,7 @@ msgstr ""
 "\n"
 "Error SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4678,25 +4697,25 @@ msgstr ""
 "\n"
 "Error SSL desconocido: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprueba que tu nombre de usuario y contraseña sean correctos."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Error eliminando la lista de privacidad"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4705,30 +4724,30 @@ msgstr ""
 "La lista de privacidad %s no se ha eliminado. Podría estar activa en uno de "
 "tus recursos conectados. Desactívalo y prueba de nuevo."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "No es posible enviar archivos vacíos"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Ni la presencia remota ha sido firmada, ni se ha asignado una clave"
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "La clave del contacto (%s) no coincide con la clave asignada en Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Este mensaje está *cifrado* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4737,30 +4756,40 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Invitar _Contactos"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "No conseguido debido al estado invisible"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "falló la publicación de la vCard"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Observadores"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transportes"
 
@@ -4769,14 +4798,19 @@ msgid "Not in roster"
 msgstr "No está en el roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Los enlaces D-Bus de python no se encuentran en este ordenador"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "falta la dependencia pysqlite2 (tcc python-pysqlite2). Saliendo..."
@@ -4852,56 +4886,69 @@ msgid "eleven"
 msgstr "once"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s en punto"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s y cinco"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s y diez"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s y cuarto"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s y veinte"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s y veinticinco"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s y media"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "%(1)s menos veinticinco"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "%(1)s menos veinte"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "%(1)s menos cuarto"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "%(1)s menos diez"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "%(1)s menos cinco"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s en punto"
 
@@ -4969,224 +5016,224 @@ msgstr "Carácter no válido en el nombre del host."
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "En líne_a"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "En línea"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Miembro"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "está escribiendo..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensaje pendiente"
 msgstr[1] "%d mensajes pendientes"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " del salón %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " del usuario %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " de %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Error ejecutando \"%(command)s\": %(error)s"
@@ -5202,11 +5249,11 @@ msgstr "%s no es un nivel de registro válido"
 msgid "error: cannot open %s for reading"
 msgstr "error: no se puede abrir %s para lectura"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "migrando la base de datos de registros a los índices"
 
@@ -5858,14 +5905,14 @@ msgstr ""
 "cancelada."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 "[Esto es parte de una sesión cifrada. Si ves este mensaje, algo fue mal.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5874,16 +5921,28 @@ msgstr ""
 "El host %s que configuraste como la opción avanzada ft_override_host_to_send "
 "no es válido, será ignorado."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "No se ha facilitado la clave OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Te conectarás a %s sin OpenPGP"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar enviando y reciviendo mensajes, necesitarás volver a conectar."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Error de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5892,31 +5951,31 @@ msgstr ""
 "%s\n"
 "La mensajería de enlace local podría no funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor, comprueba si Avahi o Bonjour están instalados."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "No se pudo iniciar servicio local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "No se pudo enlazar al puerto %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor, comprueba si avahi-daemon se encuentra en ejecución."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "No se pudo cambiar el estado de la cuenta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5925,20 +5984,20 @@ msgstr ""
 "enviado."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Este mensaje está cifrado]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Tu mensaje no pudo ser enviado."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "El contacto está desconectado. Tu mensaje no pudo ser enviado."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5950,24 +6009,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error añadiendo el servicio. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Mensajes por defecto"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "No está disponible el diccionario para el idioma %s"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5976,74 +6035,74 @@ msgstr ""
 "Tienes que instalar el diccionario %s para usar el corrector, o elegir otro "
 "lenguaje definiendo la opción speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "¿Reconectar ahora?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Si quieres que se apliquen todos los cambios instantáneamente, debes "
 "reconectar."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Eventos sin leer"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Lee todos los eventos pendientes antes de eliminar esta cuenta."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Has abierto una conversación con la cuenta %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Todas las conversaciones y grupos de charla serán cerrados. ¿Deseas "
 "continuar?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Para cambiar el nombre de la cuenta, debes leer el resto de\n"
 " eventos pendientes"
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta ya está en uso"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6051,141 +6110,147 @@ msgstr ""
 "Este nombre ya está en uso por otra de tus cuentas. Por favor, escoge otro "
 "nombre."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Renombrar cuenta"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduce un nuevo nombre para la cuenta %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Una ID de Jabber debe estar en la forma \"usuario@nombreservidor\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Selección de clave OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Debes crear una cuenta antes de editar tu información personal"
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sin una conexión, no puedes editar tu información personal"
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Tu servidor no soporta vCard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Tu servidor no puede guardar tu información personal."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "La cuenta local ya existe."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor, renómbralo o elimínalo antes de habilitar la mensajería de enlace "
 "local."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Lista de expulsión"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Lista de miembros"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Lista de propietarios"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr ""
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Alias"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Puesto"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Expulsando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6193,11 +6258,11 @@ msgstr ""
 "<b>¿A quién quieres expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Añadiendo miembro..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6205,11 +6270,11 @@ msgstr ""
 "<b>¿A quién quieres hacer miembro?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Añadiendo propietario..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6217,11 +6282,11 @@ msgstr ""
 "<b>¿A quién quieres hacer propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Añadiendo administrador..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6229,7 +6294,7 @@ msgstr ""
 "<b>¿A quién quieres hacer administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6246,59 +6311,59 @@ msgstr ""
 "usuario@dominio, dominio/recurso o dirección conteniendo\n"
 "un subdominio."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Si la eliminas, se perderá la conexión con el servidor"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Entrar y salir sólamente"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Todos"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Nuevo grupo de charla"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6306,66 +6371,65 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Alias no válido"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alias no permitido: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Servidor no válido"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Puedes configurar opciones avanzadas de la cuenta pulsando el botón "
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifica un servidor donde te quieras registrar."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "El certificado ya está en el archivo"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Este certificado ya está en el archivo %s, no fue añadido de nuevo."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6380,7 +6444,7 @@ msgstr ""
 "Error SSL: %(error)s\n"
 "¿Aún quieres conectar a este servidor?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6391,63 +6455,63 @@ msgstr ""
 "Huella SHA1 del certificado:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Primer mensaje recibido"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Primer mensaje recibido focalizado"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Primer mensaje recibido desfocalizado"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Mensaje enviado"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Resaltado de mensaje de grupo de charla"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Mensaje de grupo de charla recibido"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Correo de GMail recibido"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6457,7 +6521,7 @@ msgstr ""
 "recibido por el extremo remoto. Si este icono permanece\n"
 "mucho tiempo, probablemente el mensaje se haya perdido."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6465,74 +6529,74 @@ msgstr ""
 "El texto bajo esta línea es lo que ha sido dicho desde la última vez que "
 "prestaste atención a este salón de charla"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Salir"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" en la URL del Diccionario y no está en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" en la URL de la búsqueda web"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "_Abrir como enlace"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "hace %i días"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "La ID de Jabber ya está en la lista"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "La ID de Jabber que introdujiste ya está en la lista. Elige otra."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "nuevo@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nuevo%d@jabber.id"
@@ -6567,125 +6631,125 @@ msgstr "Nombre de contacto"
 msgid "Set Mood"
 msgstr "Definir estado de ánimo"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "¿Sobreescribir mensaje de estado?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Este nombre ya se usa. ¿Quieres sobreescribir este mensaje de estado?."
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Guardar como mensaje de estado predefinido"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Escribe un nombre para este mensaje de estado"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "Dirección AIM:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Número GG:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Número ICQ:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "Dirección MSN:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Dirección Yahoo!:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduce la inforamción del contacto que quieres añadir a la "
 "cuenta %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, rellena la información del contacto que quieres añadir"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario no contiene un recurso."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "No puedes añadirte a tí mismo a tu roster."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Desarrolladores actuales:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Desarrolladores anteriores:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "AGRADECIMIENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Por último pero no menos importante, queremos agradecer a todos los "
 "mantenedores de paquetes."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Fran Alburquerque <frank@giingo.org>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6698,89 +6762,99 @@ msgstr ""
 "\n"
 "No se usará el resaltado de los errores de escritura"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "El alias tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Petición de adición para la cuenta %(account)s de %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un grupo de charla con la cuenta %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Nombre de cuenta no válido"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "La cuenta desde la que quieres entrar al salón"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Alias no válido"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "ID de Jabber no válida para el grupo de charla"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Esto no es un grupo de charla"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s no es el nombre de un grupo de charla."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sin una conexión, no puedes sincronizar tus contactos."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Esta cuentano está conectada al servidor"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "No puedes sincronizar con una cuenta hasta que no te hayas conectado."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6789,298 +6863,298 @@ msgstr ""
 "enviar un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "No se puede analizar \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nuevo correo-e"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Invitación a grupo de charla"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Contacto cambió su estado"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje en la cuenta %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Me gustaría añadirte a mi lista de contactos."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr "Dirección"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Malhumorado"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 msgid "Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidad <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidad para %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Orden: %(order)s, acción: %(action)s, tipo: %(type)s, valor: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orden: %(order)s, acción: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar una regla</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Añadir una regla</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listas de privacidad para %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Listas de privacidad"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Nombre de lista no válido"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Debes introducir un nombre para crear una una lista de privacidad."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Has sido invitado a un grupo de charla"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact te ha invitado a entrar en una discusión"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact te ha invitado al grupo de charla %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "¿Quieres aceptar la invitación?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cuando %s esté:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Añadiendo notificación especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "cuando esté "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7091,19 +7165,19 @@ msgstr ""
 "\n"
 "La cadena corta de autentificación de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Ya verificaste la identidad de este contacto."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Identidad del contacto verificada"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Verificar de nuevo..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7113,19 +7187,19 @@ msgstr ""
 "persona esperada, necesitas verificar su identidad haciendo click en el "
 "botón inferior."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "La identidad del contacto NO fue verificada"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "¿Has verificado la identidad del contacto?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7140,22 +7214,22 @@ msgstr ""
 "\n"
 "La Cadena Corta de Autentificación (CCA) de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "¿Se lo dijiste a tu contacto remoto y verificaste el CCA?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "La clave del contacto (%s) <b>no coincide</b> con la clave asignada en Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "No se ha asignado una clave GPG a este contacto. No podrás cifrar mensajes."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7164,7 +7238,7 @@ msgstr ""
 "de modo que <b>no</b> será cifrado. Usa tu cliente GPG para otorgar "
 "confianza a esta clave."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7259,20 +7333,20 @@ msgstr "Descripción"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Marcador ya definido"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Puedes gestionar tus marcadores mediante el menú Acciones de tu roster"
 
@@ -7284,15 +7358,15 @@ msgstr "Añadido"
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Nuevo post"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
@@ -7748,31 +7822,31 @@ msgstr "Gajim necesita el servidor X para para funcionar. Abortando..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim necesita PyGTK 2.8 o superior"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim necesita PyGTK 2.8 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim necesita GTK 2.8 o superior"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim necesita GTK 2.8 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La biblioteca GTK+ necesita soporte de libglade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7781,22 +7855,22 @@ msgstr ""
 "Por favor elimina tu actual biblioteca GTK+ e instala la última versión "
 "estable desde %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Por favor, asegúrate de que GTK+ y PyGTK tienen soporte libglade en tu "
 "sistema."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necesita PySQLite2 para funcionar"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necesita pywin32 para funcionar"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7806,11 +7880,11 @@ msgstr ""
 "obtenerlo en %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim ya se encuentra en ejecución"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7818,36 +7892,36 @@ msgstr ""
 "Otra instancia de Gajim parece estar ya en ejecución\n"
 "¿Ejecutar otra?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Introduce la contraseña GPG para la clave %(keyid)s (cuenta %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Ninguna clave GPG asignada"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Te conectarás a %s sin OpenPGP"
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Contraseña equivocada"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7858,59 +7932,59 @@ msgstr ""
 "ocupante.\n"
 "Especifica otro alias abajo:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "¿Aceptas esta petición en la cuenta %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorización HTTP (%(method)s) para %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error mientras se enviaba %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Petición de adición"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7918,77 +7992,77 @@ msgstr ""
 "Siempre le verás desconectado.\n"
 "¿Le quieres eliminar de tu lista de contactos?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Eliminar"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s ahora es conocido como %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está ahora %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s ha cambiado el asunto a %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Cualquier ocupante puede ver tu JID completo"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "El salón ahora muestra miembros no disponibles"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "el salón ahora no muestra miembros no disponibles"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Ha ocurrido un cambio en el salón no relacionado con la privacidad"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Ha sido activado el registro del salón"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "El salón está ahora deshabilitado"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "El salón es ahora no-anónimo"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "El salón es ahora semi-anónimo"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "El salón es ahora completamente anónimo"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Se requiere una contraseña para entrar al salón %s. Introdúcela."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7996,20 +8070,25 @@ msgstr ""
 "Configuraste Gajim para usar un agente GPG, pero no hay ningún agente en "
 "ejecución o el mismo devolvió una contraseña errónea.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Contraseña incorrecta"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG no es usable"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -8017,13 +8096,14 @@ msgid ""
 msgstr ""
 "No se ha asignado una clave GPG a este contacto. No podrás cifrar mensajes."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_No preguntarme otra vez"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8033,19 +8113,19 @@ msgstr ""
 "correctamente (la variable de entorno probablemente no fue \t\t\t\t\t\t"
 "\tcorrectamente definida)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Correo nuevo en %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Tienes %d nueva conversación de correo"
 msgstr[1] "Tienes %d nuevas conversaciones de correo"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8060,44 +8140,44 @@ msgstr ""
 "Asunto: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina contacto del roster"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Has recibido con éxito el archivo %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Has enviado con éxito el archivo %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8106,36 +8186,36 @@ msgstr ""
 "No se puede descifrar el mensaje de %s\n"
 "Es posible que haya sido manipulado."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "No se puede descifrar el mensaje"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Conflicto con nombre de usuario"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escribe un nuevo nombre de usuario para tu cuenta local"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Error."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Conflicto en el recurso"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8143,11 +8223,11 @@ msgstr ""
 "Ya estás conectado a esta cuenta con el mismo recurso. Por favor escribe uno "
 "nuevo"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Error verificando el certificado SSL"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8158,15 +8238,15 @@ msgstr ""
 "(error)s\n"
 "¿Aún quieres conectarte a este servidor?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este error para este certificado"
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Error del certificado SSL"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8183,11 +8263,11 @@ msgstr ""
 "\n"
 "¿Aún quieres conectar y actualizar la huella del certificado?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Conexión no segura"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8195,11 +8275,11 @@ msgstr ""
 "Vas a enviar tu contraseña en una conexión no cifrada- ¿Estás seguro de "
 "querer hacer esto?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sí, quiero conectarme de forma no segura"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8207,21 +8287,21 @@ msgstr ""
 "Vas a enviar tu contraseña a través de una conexión no segura. Deberías "
 "instalar PyOpenSSL para prevenirlo. ¿Estás seguro de que quieres hacerlo?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "El nodo PEP no fue eliminado"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "El nodo PEP %(node)s no se pudo eliminar: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Emoticonos desactivados"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8229,7 +8309,7 @@ msgstr ""
 "No se pudo encontrar tu tema de emoticonos configurado, los emoticonos han "
 "sido desactivados."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8239,13 +8319,13 @@ msgstr ""
 "actualizar el formato del archivo emoticons.py. Mira http://trac.gajim.org/"
 "wiki/Emoticons para más detalles."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "No puedes entrar a un grupo de charla estando invisible"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
@@ -8279,12 +8359,13 @@ msgstr ""
 "en una línea separada"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "cuenta"
 
@@ -8311,9 +8392,9 @@ msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
 "ocupado, invisible"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "mensaje"
 
@@ -8331,22 +8412,47 @@ msgstr ""
 "global status\" activada"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Cambia el estado de una o varias cuentas"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Pr_ioridad:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Quiero _registrar una nueva cuenta de Jabber"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"cambia el estado de la cuenta \"account\". Si no se especifica, prueba a "
+"cambiar el estado de todas las cuentas que tienen la opción \"sync with "
+"global status\" activada"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Muestra el diálogo de conversación para enviar mensajes a un contacto"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contacto con el que quieres conversar"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "si es especificado, el contacto es obtenido de la lista de esta cuenta"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8356,29 +8462,29 @@ msgstr ""
 "clave OpenPGP como la cuenta son opcionales. Si quieres definir sólo "
 "'cuenta' sin 'clave pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "contenido del mensaje"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "clave pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "si es especificado, el mensaje será cifrado usando su clave pública"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "si es especificado el mensaje será enviado a través de esta cuenta"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8388,138 +8494,138 @@ msgstr ""
 "como la cuenta son opcionales. Si quieres definir sólo 'cuenta' sin 'clave "
 "pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema del mensaje"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Envía un nuevo mensaje a un grupo de charla al que hayas entrado"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "La JID del salón que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Obtener información detallada de un contacto"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID del contacto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Obtener información detallada de una cuenta"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nombre de la cuenta"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "archivo"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "si es especificado el archivo será enviado usando esta cuenta"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Lista todas las preferencias y sus valores"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define el valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'entrada' es el nombre de la preferencia, 'valor' es el valor a definir"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nombre de la preferencia a eliminar"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe el estado actual de la preferencias de Gajim al archivo de "
 "configuración"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Elimina contacto del roster"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Añade contacto al roster"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Añade nuevo contacto a esta cuenta."
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devuelve el estado actual (el global si no se especifica una cuenta)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devuelve el mensaje de estado actual (el global si no se especifica una "
 "cuenta)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Devuelve el número de mensajes sin leer"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abre el diálogo de iniciar conversación"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversación usando esta cuenta"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8527,72 +8633,72 @@ msgstr ""
 "Cuenta a la que el xml será enviado; si no se especifica nada, el xml será "
 "enviado a todas las cuentas"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Manejar una uri xmpp:/"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI a manejar"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "La cuenta que quieres manejar"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "contenido del mensaje"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Entrar en un salón MUC"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "salón"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "JID del salón"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "alias"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Alias a usar"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "contraseña"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Contraseña para entrar al salón"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "La cuenta desde la que quieres entrar al salón"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Comprueba si Gajim se encuentra en ejecución"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Muestra u oculta la ventana ipython"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8601,15 +8707,15 @@ msgstr ""
 "'%s' no está en tu lista de contactos.\n"
 "Por favor, especifica una cuenta para enviar el mensaje."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "No tienes cuentas activas"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Parece que Gajim no está en ejecución. No puedes usar gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8618,16 +8724,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s no encontrado"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8636,7 +8742,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando es uno de:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8645,7 +8751,7 @@ msgstr ""
 "Demasiados argumentos. \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8654,7 +8760,7 @@ msgstr ""
 "No se especificó el argumento \"%(arg)s\". \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Uri incorrecta"
 
@@ -8683,288 +8789,152 @@ msgstr "No puedes eliminar el tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Ya no estás en el grupo de charla \"%(room)s\" o \"%(nick)s\" se ha ido."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Insertar alias"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Conversación con "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Conversación continuada"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Registro del salón activado"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Se ha creado un nuevo salón"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "El servidor ha asignado o modificado tu alias en el salón"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s ha sido eliminado del salón (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "cambió la afiliación"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "la configuración del salón cambió a sólo miembros"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "apagado del sistema"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** La afiliación de %(nick)s ha sido definida en &(affiliation)s por %(actor)"
 "s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** La afiliación de %(nick)s ha sido definida en %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** El rol de %(nick)s ha sido fijado a %(role)s por %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** El rol de %(nick)s ha sido fijado a %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Alias no encontrado: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Este grupo de charla no tiene tema"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s invitado a %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Alias no encontrado: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Uso: /%s <alias|JID> [motivo], expulsa el JID del grupo de charla. El alias "
-"de un ocupante puede ser sustituido, pero no si contiene \"@\". Si el JID "
-"está actualmente en el grupo de conversación, el/ella será también "
-"expulsado. NO soporta espacio en el alias."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
-"especificado."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Uso: /%s [motivo], cierra la ventana o pestaña actual, mostrando el motivo "
-"si se especifica."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Uso: /%s <JID> [reason], invita al JID al grupo de charla actual, "
-"opcionalmente proveyendo un motivo."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Uso: /%s <salón>@<servidor>[/alias], ofrece la entrada a salón@servidor "
-"opcionalmente usando el alias especificado"
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Uso: /%s <alias> [motivo], elimina del salón al ocupante especificado por el "
-"alias y opcionalmente muestra un motivo. NO soporta espacios en el alias."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Uso: /%s <alias> [mensaje], abre una ventana de conversación y envía mensaje "
-"al ocupante especificado por el alias."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Uso: /%s , muestra los nombres de los ocupantes del grupo de charla."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salón."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Uso: /%s <mensaje>, envía un mensaje sin buscar otros comandos."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "¿Estás seguro de querer abandonar el salón \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Si cierras esta ventana, serás desconectado de este grupo de charla."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruyendo %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8972,22 +8942,22 @@ msgstr ""
 "Vas a destruir definitivamente este salón.\n"
 "Puedes especificar una razón abajo:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "También puedes introducir un lugar alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -9063,6 +9033,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Nuevo grupo de charla"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Me gustaría añadirte a mi lista de contactos"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "No se puede encontrar la base de datos del historial"
@@ -9146,52 +9124,62 @@ msgstr "Histórico de conversaciones con %s"
 msgid "Disk Error"
 msgstr "Error de disco"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está ahora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Mensaje de error: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Error."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Expiró el tiempo para cargar la imagen"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "La imagen es demasiado grande"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "No estás conectado al servidor"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "¿Realmente quieres eliminar el mensaje seleccionado?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Conversaciones privadas"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Mensajes"
 
@@ -9252,18 +9240,18 @@ msgstr "_Ignorar"
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "El archivo está vacío"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "No se pudo cargar la imagen"
 
@@ -9295,46 +9283,46 @@ msgstr ""
 "Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
 "nuevo más tarde."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" acepta esta petición podrás saber su estado."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG no es usable"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Estás participando en uno o más grupos de charla"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9342,28 +9330,28 @@ msgstr ""
 "Cambiando tu estado a invisible provocará tu desconexión de los grupos de "
 "charla. ¿Estás seguro de querer ser invisible?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "desincronizado"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "¿Estás seguro de querer abandonar los salones \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9371,27 +9359,27 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado y el contacto está en tu roster."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Debes leerlos antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "Ya no podrás enviar y recibir mensajes de contactos que usen este transporte"
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Los transportes serán eliminados"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9399,57 +9387,68 @@ msgid ""
 msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos de estos transportes: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Renombrar contacto"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduce un nuevo alias para el contacto %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Renombrar grupo"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduce un nuevo nombre para el grupo %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "¿Quieres eliminar el grupo %s del roster?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Eliminar del roster también a todos los contactos dentro del grupo"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9458,11 +9457,11 @@ msgstr ""
 "resultante y el/ella siempre te verán desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "¿Quieres continuar?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9470,16 +9469,16 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Quiero que este contacto conozca mi estado después de la eliminación"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Los contactos serán eliminados de tu roster"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9489,19 +9488,32 @@ msgstr ""
 "también estás eliminando las autorizaciones resultantes y ellos siempre te "
 "verán desconectado."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debes crear una cuenta antes de poder conversar con otros contactos."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tu servidor no soporta almacenamiento de metacontactos"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9509,12 +9521,12 @@ msgstr ""
 "Tu servidor no soporta almacenar información de metacontactos. Luego toda la "
 "información referente no se guardará en la próxima reconexión."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9524,23 +9536,23 @@ msgstr ""
 "Generalmente se usan cuando la misma persona tiene varias cuentas de Jabber "
 "o cuentas de transportes."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "URI de archivo no válido:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Quieres enviar este archivo a %s:"
 msgstr[1] "Quieres enviar estos archivos a %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Hacer %s y %s metacontactos"
@@ -9550,115 +9562,127 @@ msgstr "Hacer %s y %s metacontactos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Gestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "de la cuenta %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Hora de publicación"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Configurar servicios..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maximizar todo"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Enviar mensaje a grupo"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "A todos los usuarios"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "A todos los usuarios en línea"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Me gustaría añadirte a mi lista de contactos"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Gestionar contactos"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Editar grupos"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Enviar mensaje"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Ejecutar comando..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Gestionar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "Renombrar"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Nuevo grupo de charla"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Desconectar"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Histórico"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Entrar en nuevo grupo de charla"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
@@ -9675,20 +9699,20 @@ msgstr "Error en la información recibida del formulario"
 msgid "No result"
 msgstr "Sin resultados"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Error de escritura en disco"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Confirma estas opciones de la sesión"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9703,7 +9727,7 @@ msgstr ""
 "\n"
 "\t¿Son aceptables estas opciones?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9901,6 +9925,132 @@ msgstr "No hay ninguna suscripción pendiente."
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Añadir _notificación especial"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Asignar clave OpenPGP"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Comando no soportado por la cuenta zeroconf."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Comandos: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Uso: /%s, limpia de texto la ventana."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Uso: /%s, oculta los botones de conversación."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Uso: /%(command)s <action>, envía action al actual grupo de charla. Usa "
+#~ "una tercera persona (p.ej. /%(command)s explota.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Uso: /%s, envía un ping al contacto"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Uso: /%s, envía el mensaje al contacto"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "No hay información de ayuda para /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Habilitar mensajería de enlace local / zeroconf"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Alias no encontrado: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Este grupo de charla no tiene tema"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s invitado a %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Alias no encontrado: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Uso: /%s <alias|JID> [motivo], expulsa el JID del grupo de charla. El "
+#~ "alias de un ocupante puede ser sustituido, pero no si contiene \"@\". Si "
+#~ "el JID está actualmente en el grupo de conversación, el/ella será también "
+#~ "expulsado. NO soporta espacio en el alias."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
+#~ "especificado."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Uso: /%s [motivo], cierra la ventana o pestaña actual, mostrando el "
+#~ "motivo si se especifica."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Uso: /%s <JID> [reason], invita al JID al grupo de charla actual, "
+#~ "opcionalmente proveyendo un motivo."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Uso: /%s <salón>@<servidor>[/alias], ofrece la entrada a salón@servidor "
+#~ "opcionalmente usando el alias especificado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Uso: /%s <alias> [motivo], elimina del salón al ocupante especificado por "
+#~ "el alias y opcionalmente muestra un motivo. NO soporta espacios en el "
+#~ "alias."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Uso: /%s <alias> [mensaje], abre una ventana de conversación y envía "
+#~ "mensaje al ocupante especificado por el alias."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr ""
+#~ "Uso: /%s , muestra los nombres de los ocupantes del grupo de charla."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salón."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr "Uso: /%s <mensaje>, envía un mensaje sin buscar otros comandos."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
+
 #~ msgid "Your JID:"
 #~ msgstr "Tu JID"
 
diff --git a/po/eu.po b/po/eu.po
index 94ebc0e86..1d8f7c8b1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:50+0200\n"
 "Last-Translator: Urtzi  <>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -221,6 +221,7 @@ msgstr "<b>Informazio Pertsonala</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Kontua"
 
@@ -289,8 +290,8 @@ msgstr "Informazio Pertsonala Editatu..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -301,8 +302,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Orokorra"
 
@@ -363,25 +364,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Zuri buzuzko informazioa zerbitzarian gordea izango da"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ezer ez"
 
@@ -541,8 +538,8 @@ msgstr ""
 "You might consider to change possible firewall settings."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -556,7 +553,7 @@ msgid "Mer_ge accounts"
 msgstr "_Batu kontuak"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "_Berrizenpetu"
 
@@ -824,7 +821,7 @@ msgid "All statuses"
 msgstr "Egoera Guztiak"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Kanpoan"
 
@@ -841,7 +838,7 @@ msgid "Have "
 msgstr "daukadanean"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Ikusezin"
 
@@ -850,7 +847,7 @@ msgid "Launch a command"
 msgstr "Abiarazi agindua"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Ez Erabilgarri"
 
@@ -1043,7 +1040,7 @@ msgid "Join _Group Chat"
 msgstr "Txat Taldean _Sartu"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "_Zerrendara Sartu"
@@ -1070,65 +1067,154 @@ msgstr "Web-ean _Ireki Lotura"
 msgid "_Start Chat"
 msgstr "Elkarrizketa  _Hasi"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Honera gonbidatu"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Begiratzaileak"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Bere egoera ikusteko esan"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Gehitu _Noifikazio Berezia"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Open_PGP kodea zehaztu"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Komandoa Exekutatu..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Editatu _Taldeak"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "Honera gonbidatu"
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Kontaktua"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Ezabatu"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Sends custom XML"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Bidali _Mezu Bakarra..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "Bidali _Fitxeroa"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Elkarrizketa _Hasi"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Toggle Open_PGP Encryption"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Toggle Open_PGP Encryption"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Zerrendara Sartu"
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "Baimendu nire egoera ikustea"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "Debekatu nire egoera ikustea"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "_Historiala"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Honera gonbidatu"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "Begiratzaileak"
+msgid "_Manage Contact"
+msgstr "Berridatzi Kontaktua"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Berrrizenpetu"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "Har_pidetza"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "bederatzi"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Formularioan bete"
@@ -1253,7 +1339,7 @@ msgstr ""
 "Kontaktu zerrenda\n"
 "Banner Elkarrizketa "
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Negrita"
 
@@ -1277,7 +1363,7 @@ msgstr "Joanda"
 msgid "Inactive"
 msgstr "Inaktiboa"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Etzana"
 
@@ -1355,6 +1441,14 @@ msgstr "Mo_deratzailea"
 msgid "Occupant Actions"
 msgstr "_Bete Beharreko Aukerak"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Bidali _Fitxeroa"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Zerrendara Sartu"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1363,13 +1457,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Debekatu"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Bota"
@@ -1386,13 +1473,6 @@ msgstr "_Jabea"
 msgid "_Send Private Message"
 msgstr "_Bidali Mezu Pribatu bat"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Ahotsa"
@@ -1401,7 +1481,7 @@ msgstr "_Ahotsa"
 msgid "Create new post"
 msgstr "Mezu berria sortu"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "-etik"
 
@@ -1431,8 +1511,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim Historialeko Log Administratzailea"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -1478,35 +1558,40 @@ msgstr "Bilatu"
 msgid "_Log conversation history"
 msgstr "Elkarrizketaren _historiala"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "_Talde Agendan Sartu Gela hau"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 #, fuzzy
 msgid "Join this room automatically when I connect"
 msgstr "Ezarri nire profila konektatzen naizenean"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Izengoitia:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Berriki:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Sartu"
@@ -1535,7 +1620,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Inprimatu egoera:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
@@ -2088,7 +2173,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "_Sailkatu kontaktuak egoeraren bidez"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Egoera"
 
@@ -2261,34 +2346,39 @@ msgid "All"
 msgstr "Dena"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "harpidetza honekin"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Baimendu"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Ukatu"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Ordena:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Debekatze Zerrenda"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "harpidetza honekin"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "talde hontakoak"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2300,19 +2390,19 @@ msgstr ""
 "nondik\n"
 "norentzat"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "niri mezuak bidaltzea"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "niri galderak bidaltzeko"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "niri egoera bidaltzeko"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "nire egoera ikustea"
 
@@ -2504,105 +2594,11 @@ msgstr "Ezabatu kontua Gajim-etik eta baita _zerbitzaritik"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Ezabatu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Bere egoera ikusteko esan"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Gehitu _Noifikazio Berezia"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Open_PGP kodea zehaztu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "Editatu _Taldeak"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Komandoa Exekutatu..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "Honera gonbidatu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Ezabatu"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Sends custom XML"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Bidali _Mezu Bakarra..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "Bidali _Fitxeroa"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Elkarrizketa _Hasi"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "Baimendu nire egoera ikustea"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "Debekatu nire egoera ikustea"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "Berridatzi Kontaktua"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Berrrizenpetu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "Har_pidetza"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "bederatzi"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2730,7 +2726,7 @@ msgid "_Add contact"
 msgstr "Kontaktua _Sartu"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "Kontaktuaren Informazioa"
@@ -2956,26 +2952,6 @@ msgstr "_Mezua"
 msgid "_Presence"
 msgstr "_Egoera"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Gehitu _Noifikazio Berezia"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Open_PGP kodea zehaztu"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Editatu _Taldeak"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Berrrizenpetu"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Kontua E_ditatu"
@@ -3020,51 +2996,51 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Activated"
 msgstr "Aktibatuta"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Deactivated"
 msgstr "Inaktiboa"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Integer"
 msgstr "Taldean"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Izen Hautapena"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Balorea"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Mota"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Ezer ez)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Ikusezin"
 
@@ -3078,257 +3054,256 @@ msgstr "Sarrera berri bat jaso duzu:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Ingelesa"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Belarusian"
 msgstr "Bulgariera"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgariera"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Alemaniera"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Greziera"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "British"
 msgstr "Briton"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperantoa"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Gaztelania"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Frantsesa"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Kroaziera"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italiera"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Norvegian b"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Alemana"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Norwegian"
 msgstr "Norbegiera"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polakoa"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugesa"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brasileko Portugesa"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Rusiera"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Serbian"
 msgstr "Alemaniera"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Eslovakoa"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Txinera (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Ortografia hizkuntza"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "bederatzi"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Izengoitia"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Mota:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Ez dago zerrendan"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Erabili autentifikazioa"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Erabili autentifikazioa"
@@ -3336,101 +3311,58 @@ msgstr "Erabili autentifikazioa"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Azalpenak: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Erabilera: %s, testu leihoa itxi."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
-"gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr ""
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Ez dago laguntza informazioa  /%s -rentzat"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3438,22 +3370,22 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
@@ -3462,23 +3394,23 @@ msgstr "%(nick)s orain dago %(status)s"
 msgid "creating logs database"
 msgstr "logs-en datu basea sortzen"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s fitxero bat da baina direktorio bat izan daiteke"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim orain badago"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "%s direktorioa sortzen"
@@ -3550,9 +3482,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 #, fuzzy
 msgid "Groupchats"
 msgstr "Txat Taldeak"
@@ -3571,71 +3503,112 @@ msgstr "%d mezu irakurri gabe"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Erabili D-Bus eta Notification-Daemon jakinarazketak erakusteko"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Ordua minutuetan, zure egoera kanpoan aldatu ondoren."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Kanpoan beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Ordua minutuetan, zure egoera ez erabilgarri aldatu ondoren."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Ez erabilgarri beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Baliogabeko izena"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "egoera mezuaren testua"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Baliogabeko izena"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Izengoitia Aldatu"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "egoera mezuaren testua"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "Berezkoa"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Enable link-local/zeroconf messaging"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Zuzentzaileak erabiltzen duen hizkuntza"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3645,7 +3618,7 @@ msgstr ""
 "'sometimes' - inprimatu ordua print_ichat_every_foo_minutes minutuko.\n"
 "'never' - inoiz ez inprimatu ordua."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -3656,17 +3629,17 @@ msgstr ""
 "fuzzyclocks-ri eta 0 fuzzyclock ezintzeko. 1 ordu zehatzena da, 4 berriz, "
 "zehaztasun gutxienekoa."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 #, fuzzy
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
@@ -3676,7 +3649,7 @@ msgstr ""
 "Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
 "(If you want to use this, install docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3684,7 +3657,7 @@ msgstr ""
 "Izengoitiaren ondoren ezartzeko karakterea txat talde batean tab-a "
 "erabiltzen bada."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3692,38 +3665,52 @@ msgstr ""
 "Izengoitiaren ondoren jartzeko proposatzen den karakterea, txat taldean "
 "beste pertsona batek izengoiti berbera badu."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Sartu * eta [n] zerrendako izenburuan?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr "Zenbat lerro gogoarazteko lehengo elkarrizketatik leihoa irikitzean."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren "
 "azkenetik."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3731,11 +3718,11 @@ msgstr ""
 "Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis "
 "ICQ Client default behaviour)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3744,11 +3731,11 @@ msgstr ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3760,14 +3747,14 @@ msgstr ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
 "daiteke. "
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3775,7 +3762,7 @@ msgstr ""
 "Txat elkarrizketen goera mezua ikusarazi txat leihoan. All, composing_only "
 "edo disabled izan daiteke. "
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3783,11 +3770,11 @@ msgstr ""
 "Ez denean ordua mezu bakoitzeko inprimatzen (print_time==sometimes), "
 "imprimatu x minuturo."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3795,7 +3782,7 @@ msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3803,13 +3790,13 @@ msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3818,27 +3805,27 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC estandarrak esaten du KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Jakin arazi gertaerak system trayicon-ean."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3846,17 +3833,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3864,13 +3851,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Egia bada, Gajim-ek erregistratuko du xmpp:/ abiaraztean."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3878,7 +3865,7 @@ msgstr ""
 "Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri gabeko "
 "mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3886,11 +3873,11 @@ msgstr ""
 "Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
 "kontaktuaren izenaren azpian azalduko dira."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3898,7 +3885,7 @@ msgstr ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3906,7 +3893,7 @@ msgstr ""
 "Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
 "aldaketa egiten duenean edo/eta bere egoera mezua."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 #, fuzzy
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
@@ -3921,30 +3908,30 @@ msgstr ""
 "inprimatuko ditu. \"in_and_out\" bada, Gajim-ek sarrera/irteerak inprimatuko "
 "ditu bakarrik."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Kontaktuen atzealdeko kolorea momentuan konektatzen direnean."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Kontaktuen atzealdeko kolorea momentuan deskonektatzen direnean."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Egia bada, mezuen berrezartzea tamaia txikian egingo dira eta ez "
 "ezarritakoan."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ez erakutsarazi transporteen ikurrak."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "ez erakutsi zerrenda sistemako zeregin barran."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3954,7 +3941,7 @@ msgstr ""
 "badira, make the window flash (the default behaviour in most Window "
 "Managers) when holding pending events."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3965,7 +3952,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3985,32 +3972,32 @@ msgstr ""
 "konkretu batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi "
 "behar da."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Gezurra bada, txat leihoan ez duzu abatererik ikusiko. "
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Egia bada, ateratzeko botoila sakatzean tab/leihoa itxiko da."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Ezkutatu botoiak txat taldeko leihoan."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Ezkutatu banner-a txat talde leihoan"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Ezkutatu banner-a bi pertsonen txat leihoan "
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Ezkutatu gelako jendearen zerrenda txat taldeko leihoan."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -4018,28 +4005,28 @@ msgstr ""
 "Elkarrizketa batean, bakarrik lerroaren hasieran izengoitia erakutsi  ez "
 "denean lehengo mezuan hitz egiten ari zinen pertsona bera. "
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickame."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Bidali mezua eta itxi leihoa"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Txat taldeko izengoitietan erabiliko diren koloreen zerrenda"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4047,7 +4034,25 @@ msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
+"never show the dialog."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
+"never show the dialog."
+
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -4058,81 +4063,91 @@ msgstr ""
 "lehentasun negatiboarekin konektatzean, EZ duzu mezurik jasoko "
 "zerbitzariarengandik. "
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4140,68 +4155,79 @@ msgstr ""
 "Lehentasuna zure egoeraren arabera aldatuko da. Lehentasunak autopriority_* "
 "aukeran ezarriak daude."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Gezurra bada, txat leihoan ez duzu abatererik ikusiko. "
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4209,125 +4235,125 @@ msgstr ""
 "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
 "file_transfer_proxies-en  fitxero transferentziarako."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP aktibatu al dago kontu honetarako?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "dena edo espazio egoera banandua"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'bai', 'ez', edo 'biak'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'bai', 'ez' edo ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jaten"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Filmea"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Lanean"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "kanpoan"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Libre."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Libre Hitz Egiteko."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Ez Erabilgarri."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Ez nahasi."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Agur!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4335,178 +4361,185 @@ msgstr ""
 "Soinua bat entzun MUC-ak muc_highlight_words-eko hitz bat agertzean edota "
 "gela bateko mezu batek zure izengoitia duenean."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "arrantzale"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Host okerra"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Erregistroaren informazioa transporteetarako %s ez da denboran iritsi"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard argitarapena egina"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Baimenik gabeko izengoitia: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Ezin da gela honetara sartu"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Gela sortzea mugatua dago."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Erregistratutako izengoitia erabilia izan behar da."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Ez zaude kideen zerrendan."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s -ra harpidetuak gaude orain"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Harpidetza kentzekoa eskaera %s -tik"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s -ren harpidetzatik kenduta gaude"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4515,285 +4548,271 @@ msgstr ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP pasa-esaldia ez da eman"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "%s konektatu behar zara OpenPGP-rik gabe."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Baliogabeko izena"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Manualki konektatu berriro."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Erantzun baliogabea"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "%s gordea"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Begira ezazu zure konexioa edo saiatu berriro"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Mezu hau *enkriptatua\" dago (Ikusi: JEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4802,30 +4821,40 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktua"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Ez bidali ikusezin egoerarengatik"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Konexioak huts egin du"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Begiratzaileak"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transportea"
 
@@ -4835,14 +4864,19 @@ msgid "Not in roster"
 msgstr "Ez dago zerrendan"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim-en D-Bus gaitasun funtzioa ezin da erabili"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -4920,56 +4954,69 @@ msgid "eleven"
 msgstr "hamaika"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s o'clock"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s eta bost"
 
 #: ../src/common/fuzzyclock.py:44
+#, fuzzy, python-format
 msgid "ten past %(0)s"
 msgstr "&0 eta hamar"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s eta laurden"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s eta hogei"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s eta hogeita bost"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s eta erdiak"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "%(1)s hogeita bost gutxi "
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "%(1)s hogei gutxi"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "%(1)s laurden gutxi"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "%(1)s -tik hamarrera"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "%(1)s bost gutxi"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s ordu batak"
 
@@ -5037,224 +5084,224 @@ msgstr "Baliogabeko karakterea hostname -ean."
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "Lan_petuta"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Libre"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Libre"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "Ikuse_zin"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Ezin da jakin"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "Errorea du"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Norentzat"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Biak"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Partaideak"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Jabea"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administratzailea"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "mezu bat sortzen ari da..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gib"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bidali mezua"
 msgstr[1] "Bidali mezua"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5270,11 +5317,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indeces"
@@ -5994,13 +6041,13 @@ msgstr ""
 "bertan behera utziko da."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -6009,16 +6056,28 @@ msgstr ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP pasa-esaldia ez da eman"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "%s konektatu behar zara OpenPGP-rik gabe."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -6027,32 +6086,32 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Ezin izan da zerbitzu lokalak hasi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ezin izan da \"%s\" -ren egoera aldatu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -6060,21 +6119,21 @@ msgstr ""
 "Ez zaude konektatuta edo ikusezin zaude. Ezin izan da zure mezua bidali."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
@@ -6085,26 +6144,26 @@ msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
 msgid "Error while adding service. %s"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Ezindu"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Berezko Egoera Mezuak"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Aktibatu"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6113,72 +6172,72 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Birkargatu orain?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Momentuan aldaturiko aukerak ezarri nahi badituzu, birkargatu beharko duzu."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Irakurri gabeko gertaerak"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Txat-a %s kontuan ireki duzu"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Elkarrizketa guztiak itxiko dira. Jarraitu nahi al duzu?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Kontuko izena aldatzeko,  irakurri gabeko gertaera guztiak irakurri behar "
 "dituzu."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Kontu Izena Jadanik Erabilia"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6186,142 +6245,148 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kontuak moldatu"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Kontu bat sortu behar duzu informazio petsonala editatu baino lehen."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Zerbitzariak ezin du zure informazio pertsonala gorde"
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Kontu izena jadanik badago"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Mesedez berridatzi edo ezabatu hori  link-local messaging martxan jarri "
 "baino lehen."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Izengoitia"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6329,11 +6394,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6341,11 +6406,11 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6354,11 +6419,11 @@ msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6366,7 +6431,7 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6383,59 +6448,59 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Berezkoa"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "Denak"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Denak"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6443,68 +6508,66 @@ msgstr ""
 "talde agenda hau ezabatzeaz"
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Baimenik gabeko izengoitia: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr "Kontuko aukera aurreratuak ezarri ditzakezu Aurreratu botoila sakatuz."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6514,7 +6577,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6522,148 +6585,148 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktibatuta"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Lehen Mezu Jasoa"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontaktua Konektatuta"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "GMail posta jasoa"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "Beheko testua adi zeuden azken uneko txat taldeko mezuak dira"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "At_era"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr " \"%s\" -rako _aukerak"
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL hiztegia galdu egin da \"%s\" -an eta ez dago WIKTIONARY-an"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Ireki _lotura bezala"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Atzo"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i egun lehenago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "IM Jabber Bezeroa"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6699,21 +6762,21 @@ msgstr "Kontaturen izena"
 msgid "Set Mood"
 msgstr "Ezarri MOTD"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Egoera Mezua"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6721,106 +6784,106 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Aurrez Ezarritako Mezua Jarri"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Mesedez ezarri izen bat egoera mezu honetarako"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM Hebidea:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG zenbakia:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ zanbakia:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN Helbidea:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Helbide:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Mesedez ezarri sartu nahi duzun kontaktuaren informazioa %s kontuarako"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Erabiltzailearen ID:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ Bertsioa:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK Bertsioa:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Egungo diseinatzaileak: "
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Aurre diseinatzaileak: "
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "ESKERRAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Azkenak baina ez gutxien merezitakoak,\n"
 "eskerrak eman nahi dzkiegu paketeak mantentzen dituztenei."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6831,93 +6894,104 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat Taldera Sartu %s kontuarekin"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Kontu izen baliogabea"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr ""
+"Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID gela baliogabea"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Hau ez da txat talde bat"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ez da txat gela baten izena."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Elkarrizketa Hasi %s kontuarekin"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6926,301 +7000,301 @@ msgstr ""
 "kontaktuaren Jabber ID-a edota izengoitia:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "JID Baliogabea"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Mezu Berri Bat"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontua erabiliz"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mezu Bakarra %s Kontuan"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "%s naiz"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr " XML Konsola"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr "Gehitu"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Eraldatu"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Taldea"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Debekatze Zerrenda <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Agindua: %s, akzioa: %s, mota %s, balorea %s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Agindu: %s, ekintza: %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Baliogabeko izen zerrenda"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Izen bat sartu beharra duzu debekatze zerrenda bat egiteko."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "nagoenean"
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7228,38 +7302,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7269,26 +7343,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7383,20 +7457,20 @@ msgstr "Deskribapena"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Talde agenda ezarria"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "\"%s\" gela zure talde agendan dago jadanik."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Talde agenda egoki sortu da"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
@@ -7410,15 +7484,15 @@ msgstr "Harpidetu"
 msgid "Node"
 msgstr "Ezer ez"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Mezu berria"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "Harpidetza ezabat_u"
 
@@ -7861,31 +7935,31 @@ msgstr "Gajim-ek Xserver behar du abiarazteko. Uzten..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ rutinak ez du libglade sostengatzen"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7893,20 +7967,20 @@ msgid ""
 msgstr ""
 "GTK+ rutina ezabatu eta instalatu ezazu azken bertsio establea %s hemendik"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Konproba ezazu GTK+ eta  PyGTK  libglade onartzen dutea zure sistemak."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim-ek  pywin32  behar du abiarazteko"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7916,11 +7990,11 @@ msgstr ""
 "dezakezu hau."
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim dagoeneko abiarazi da"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7928,34 +8002,34 @@ msgstr ""
 "Beste Gajim prozesu bat abiarazita dagoela dirudi\n"
 "Abiarazi dena den?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "%s konektatu behar zara OpenPGP-rik gabe."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7965,183 +8039,189 @@ msgstr ""
 "Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
 "Mesedez ezarri beste izengoiti bat:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Harpidetza Eskaria"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Harpidetza ezabat_u"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Pasahitza behar da gela honetan sartzeko."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Zure pasa-esaldia ez da egokia"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "E_z galdetu berriro  "
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "E-posta Berria %(gmail_mail_address)s -en"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "%d e-posta elkarrizketa duzu"
 msgstr[1] "%d e-posta elkarrizketa dituzu"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8151,93 +8231,93 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Ondo jasoa izan da  %(name)s-ren %(filename)s  fitxeroa."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Mezu _guztietan"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8245,15 +8325,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8264,63 +8344,63 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konektatu"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
@@ -8356,12 +8436,13 @@ msgstr ""
 "agertuko dira."
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "kontua"
 
@@ -8386,9 +8467,9 @@ msgstr "egoera"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "mezua"
 
@@ -8406,22 +8487,47 @@ msgstr ""
 "egoera aldatzen"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Lehentas_una:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Kontu berri bat _erregistratu nahi dut"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"\"kontua\" kontuaren egoera aldatu. Ez badago zehaztua, saiatu "
+"\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
+"egoera aldatzen"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Txat leihoa erakutsi, honela, kontaktuari mezua bidali diezaiokezu"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "hautatua badago, kontaktua kontu honen kontaktu listatik lortuko da."
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8431,29 +8537,29 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "mezuaren edukia"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp giltza"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hautatua badago, kode publikoa erabiliz enkriptatuko da mezua"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8463,217 +8569,217 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "gaia"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "mezuaren gaia"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Kontuaren izena"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fitxeroa"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "Hautatua badago, fitxero hau kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Erakutsi preferentzia eta balio guztiak"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Preferentziako aukera ezabatu"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "giltza"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "preferentziaren izena borratzeko"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim-en berezko preferentzien egoera .config fitxategian idatzi"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Zerrendara kontaktua sartu"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Sartu kontaktu berria kontu honetara"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Oraingo egoera itzuli (Globala, ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Oraingo egoera mezua itzuli (Globala aukeratu ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Irakurri gabeko mezuen kontaketa itzuli"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ireki  'Txat-a Hasi' leiho"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Elkarrizketa hasi, kontu hau rabiliz"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr " XML bidaltzeko"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "mezuaren edukia"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Gela Berri Sartu"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "room"
 msgstr "-etik"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Gela:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "nick"
 msgstr "Izengoitia"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "password"
 msgstr "Pasahitza:"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8682,31 +8788,31 @@ msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
 "Kontua zehaztu mezua bidaltzeko."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumentuak:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s ez da aurkitu"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8715,7 +8821,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8724,7 +8830,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8733,7 +8839,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Host okerra"
@@ -8764,311 +8870,174 @@ msgstr "Ezin duzu zure berezko gaia ezabatu"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Ez zaude gela honetan \"%s\"jadanik edo \"%s\" joan da."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Elkarrizketaren Historiala"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konektatu"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s debekatu da %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afizioak: "
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Izengoitia aurkitugabea: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Gela honek ez du gairik"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Gonbidatu  %(contact_jid)s %(room_jid)s. gelara."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Izengoitia aurkitugabea: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Erabilera:  /%s <nickname|JID> [reason], debekatua JID-a gelatik. Erabiltzen "
-"ari den baten izengoitia aldatu egin beharko da, baina ez da aldatu "
-"beharko   \"@\" -rik  badu. JID-a jadanik gelan bada, bera botatata izango "
-"da ere. Izengoitiak EZ du onartzen tarterik. "
-
-#: ../src/groupchat_control.py:1734
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
-"erabiltzaileari."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr "Erabilera: /%s [reason],  itxi leihoa, zergatia erakutsiz behar bada."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko "
-"arrazoi bat emanez. "
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era sartzen "
-"aukeraz izengoiti bat ezarriz."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Erabilera: /%s <nickname> [reason], ezabatu izengoitiaren bidez aukeratutako "
-"erabiltzailea gelatik eta nahi bada arrazoi bat adierazi. EZ da onartzen "
-"espazioak iznegoitian."
-
-#: ../src/groupchat_control.py:1762
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Erabilera: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta "
-"bidali zehaztutako izengoitiaren erabiltzailera."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Erabilera:  /%s <nickname>, aldatu zure izengoitia gela hontan."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Erabilera:/%s , erakutsarazi gelako pertsonen izenak."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Erabilera: /%s [topic], erakuts arazi edo aktualizatu oraingo gelako gaia."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Erabilera:  /%s <message>, mezu bat bidali beste komandoak bilatu gabe."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Erabilera:  /%s <nickname>, aldatu zure izengoitia gela hontan."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
@@ -9142,6 +9111,15 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Gorde Irudia Bezala..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Txat Taldea Berria"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Nire zerrendara nahi nizuke sartu"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Ezin izan da aurkitu log-en datu basea"
@@ -9224,53 +9202,62 @@ msgstr "Elkarrizketa Historiala %s-rekin"
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s orain %(status)s dago: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Errore mezua: %s"
+
+#: ../src/history_window.py:440
+msgid "Error"
+msgstr ""
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Txat-ak"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Txat Taldeak"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Mezuak"
 
@@ -9331,12 +9318,12 @@ msgstr "bederatzi"
 msgid "Retrieving profile..."
 msgstr "Profila jasotzen..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "Honako gela honek ez du existitzen."
@@ -9344,7 +9331,7 @@ msgstr "Honako gela honek ez du existitzen."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
@@ -9376,46 +9363,46 @@ msgstr ""
 "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
 "saiatu berriro beranduago."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "\"%s\" harpidetza onartzen baduzu bere egoera ikus ahal izango duzu."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9423,44 +9410,44 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "Mezuak gero irakurri ahalko dira historiala aktibatua baduzu."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Irakurri behar dituzu transporte hau ezabatu baino lehen."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9469,11 +9456,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transporteak ezabatuko dira"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9482,58 +9469,69 @@ msgstr ""
 "Ezin izango duzu transporte hauetako kontaktuen mezuak jaso ezta bidali ere: "
 "%s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Sartu %s kontaktuarentzat nick berri bat"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Berrrizenpetu Taldea"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Ezabatu Taldea"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ezabatu nahi al duzu %s taldea zerrendatik?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Zerrendatik talde honetako kontaktu guztiak ere ezabatu"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP Kodea Izendatu"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9542,12 +9540,12 @@ msgstr ""
 "deskonektatuta ikusiko zaitu beti."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9555,16 +9553,16 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Kontaktu hau ezabatu ondoren nire egoera jakitea nahi dut"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktuak ezabatuak izango dira zure zerrendatik"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9574,20 +9572,33 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9596,12 +9607,12 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9612,24 +9623,24 @@ msgstr ""
 "kontaktuak jabber kontu bat baino gehiago duenean edo transporteetan "
 "harpidetuta dagonean erabiltzen da. "
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Fitxero Baliogabea"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s fitxero bat bidali nahi dizu:"
 msgstr[1] "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Bidali %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
@@ -9639,123 +9650,134 @@ msgstr "Egin %s eta %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz "
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "%s kontura"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Talde Agenda _Moldatu..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "%s kontukoa"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Argitaratu"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Zerbitzuak Aurkitu..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "_Bidali Taldeari Mezua"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Kontaktu guztiei"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Konektatutako kontaktu guztiei"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Nire zerrendara nahi nizuke sartu"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Berridatzi Kontaktua"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Editatu _Taldeak"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Bidali Mezu Bakarra"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Komandoa Exekutatu..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportea"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Trans_porteak Erakutsi"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Berrrizenpetu"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "Txat Taldea Berria"
+msgid "_Disconnect"
+msgstr "Kontaktua Deskonektatuta"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "T_xat Talde Berrian Sartu"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
@@ -9772,20 +9794,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Gaia: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9795,7 +9817,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9989,6 +10011,130 @@ msgstr ""
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Gehitu _Noifikazio Berezia"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Open_PGP kodea zehaztu"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Azalpenak: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Erabilera: %s, testu leihoa itxi."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
+#~ "gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Ez dago laguntza informazioa  /%s -rentzat"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Enable link-local/zeroconf messaging"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Izengoitia aurkitugabea: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Gela honek ez du gairik"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Gonbidatu  %(contact_jid)s %(room_jid)s. gelara."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Izengoitia aurkitugabea: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Erabilera:  /%s <nickname|JID> [reason], debekatua JID-a gelatik. "
+#~ "Erabiltzen ari den baten izengoitia aldatu egin beharko da, baina ez da "
+#~ "aldatu beharko   \"@\" -rik  badu. JID-a jadanik gelan bada, bera "
+#~ "botatata izango da ere. Izengoitiak EZ du onartzen tarterik. "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
+#~ "erabiltzaileari."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Erabilera: /%s [reason],  itxi leihoa, zergatia erakutsiz behar bada."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko "
+#~ "arrazoi bat emanez. "
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era "
+#~ "sartzen aukeraz izengoiti bat ezarriz."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Erabilera: /%s <nickname> [reason], ezabatu izengoitiaren bidez "
+#~ "aukeratutako erabiltzailea gelatik eta nahi bada arrazoi bat adierazi. EZ "
+#~ "da onartzen espazioak iznegoitian."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Erabilera: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta "
+#~ "bidali zehaztutako izengoitiaren erabiltzailera."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Erabilera:  /%s <nickname>, aldatu zure izengoitia gela hontan."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Erabilera:/%s , erakutsarazi gelako pertsonen izenak."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Erabilera: /%s [topic], erakuts arazi edo aktualizatu oraingo gelako gaia."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Erabilera:  /%s <message>, mezu bat bidali beste komandoak bilatu gabe."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Erabilera:  /%s <nickname>, aldatu zure izengoitia gela hontan."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Sakatu Jabber zerbitzariaren zenbait aukera(Msn ,ICQ, transport) ikusteko"
diff --git a/po/fr.po b/po/fr.po
index 89165b0ca..ea1ccdad8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12 svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:50+0200\n"
 "Last-Translator: Florent Le Coz <louizatakk@fedoraproject.org>\n"
 "Language-Team:  <>\n"
@@ -219,6 +219,7 @@ msgstr "<b>Informations personnelles</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Compte"
 
@@ -286,8 +287,8 @@ msgstr "_Éditer les informations personnelles..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -298,8 +299,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Général"
 
@@ -359,25 +360,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Les informations vous concernant, stockées sur le serveur"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Aucun"
 
@@ -537,8 +534,8 @@ msgstr ""
 "avez un."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Identifiant Jabber :"
 
@@ -552,7 +549,7 @@ msgid "Mer_ge accounts"
 msgstr "_Regrouper les comptes"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Re_nommer"
 
@@ -815,7 +812,7 @@ msgid "All statuses"
 msgstr "Tous les états"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Absent(e)"
 
@@ -832,7 +829,7 @@ msgid "Have "
 msgstr "Ai"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -841,7 +838,7 @@ msgid "Launch a command"
 msgstr "Lancer une commande"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Non disponible"
 
@@ -1027,7 +1024,7 @@ msgid "Join _Group Chat"
 msgstr "Rejoindre un _salon de discussion"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Ajouter à la liste de contacts..."
 
@@ -1053,39 +1050,6 @@ msgstr "_Ouvrir le lien dans votre navigateur"
 msgid "_Start Chat"
 msgstr "Commencer une _discussion"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Inviter des _Contacts"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Envoyer un _fichier"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Activer le chiffrement de bout en bout"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Activer le chiffrement _GPG"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Ajouter à la liste de contacts"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Historique"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "In_viter"
@@ -1110,6 +1074,119 @@ msgstr ""
 "Vous allez commencer une Conversation Groupée.\n"
 "Sélectionnez les contacts que vous voulez inviter"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Demander à voir son état"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Ajouter une _Notification Spéciale..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Assigner une clé Open_PGP..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Exécuter une commande..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Éditer les _groupes..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "In_viter à"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Inviter des _Contacts"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "Suppri_mer"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Envoyer un Statut Personnalisé"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Envoyer un _message simple..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Envoyer un _fichier..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Définir un _Avatar personnalisé..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Commencer une _discussion"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Activer le chiffrement de bout en bout"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Activer le chiffrement _GPG"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "L'autoriser à voir mon état"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Bloquer"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "Interdire de voir mon état"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Historique"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignorer"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Gérer le Contact"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Renommer..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Autorisation"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Débloquer"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Ne plus ignorer"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Remplissez le formulaire."
@@ -1230,7 +1307,7 @@ msgstr ""
 "Contact\n"
 "Bannière"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Gras"
 
@@ -1254,7 +1331,7 @@ msgstr "Parti"
 msgid "Inactive"
 msgstr "Inactif"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Italique"
 
@@ -1327,6 +1404,14 @@ msgstr "Mo_dérer"
 msgid "Occupant Actions"
 msgstr "Actions des Occupants"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Envoyer un _fichier"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Ajouter à la liste de contacts"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administrateur"
@@ -1335,13 +1420,6 @@ msgstr "_Administrateur"
 msgid "_Ban"
 msgstr "_Bannir"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Bloquer"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Éjecter"
@@ -1358,13 +1436,6 @@ msgstr "Pr_opriétaire"
 msgid "_Send Private Message"
 msgstr "_Envoyer un message privé"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Débloquer"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_S'exprimer"
@@ -1373,7 +1444,7 @@ msgstr "_S'exprimer"
 msgid "Create new post"
 msgstr "Rédiger un article"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "De"
 
@@ -1398,8 +1469,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Bienvenue dans le Gestionnaire d'Archives Gajim</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1454,34 +1525,39 @@ msgstr "Chercher :"
 msgid "_Log conversation history"
 msgstr "_Historique de conversation"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Enregistrer ce salon dans les marque-pages (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Joindre ce salon de discussion quand je me connecte"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Surnom :"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Récemment :"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Salon de discussion :"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "Re_joindre"
@@ -1510,7 +1586,7 @@ msgstr "Minimiser automatiquement"
 msgid "Print status:"
 msgstr "Afficher l'état :"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Serveur :"
 
@@ -2051,7 +2127,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Trier les contacts par état"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "État"
 
@@ -2218,34 +2294,39 @@ msgid "All"
 msgstr "Tous"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "tous par état d'inscription"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Permettre"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Refuser"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "Identifiant Jabber :"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Ordre :"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Liste privée"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "tous par état d'inscription"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "tous ceux dans le groupe"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2257,19 +2338,19 @@ msgstr ""
 "De\n"
 "À"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "à m'envoyer des messages"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "à m'envoyer des requêtes"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "à m'envoyer son état"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "à voir mon état"
 
@@ -2437,96 +2518,11 @@ msgstr "Supprimer le compte de Gajim et du _serveur"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Demander à voir son état"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Ajouter une _Notification Spéciale..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Assigner une clé Open_PGP..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Éditer les _groupes..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Exécuter une commande..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "In_viter à"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "Suppri_mer"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Envoyer un Statut Personnalisé"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Envoyer un _message simple..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Envoyer un _fichier..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Définir un _Avatar personnalisé..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Commencer une _discussion"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "L'autoriser à voir mon état"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "Interdire de voir mon état"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignorer"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Gérer le Contact"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Renommer..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Autorisation"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Ne plus ignorer"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2648,7 +2644,7 @@ msgid "_Add contact"
 msgstr "_Ajouter un contact"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "Information"
 
@@ -2863,26 +2859,6 @@ msgstr "_Message"
 msgid "_Presence"
 msgstr "_Présence"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Ajouter une notification spéciale"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Assigner une clé Open_PGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Éditer les _groupes"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Renommer"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modifier le compte..."
@@ -2928,48 +2904,48 @@ msgid "Service returned an error."
 msgstr "Le service a renvoyé une erreur."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Activé"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Désactivé"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Booléen"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Entier"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Couleur"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Option"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Valeur"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Aucune)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Éléments masqués"
 
@@ -2983,186 +2959,185 @@ msgstr "Vous avez publié l'article :"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Anglais"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Biélorusse"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Breton"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Allemand"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Grec"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Anglais (Britannique)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Basque"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Français"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Croate"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italien"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norvégien"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Portugais brésilien"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Russe"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Chinois"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Langue du correcteur orthographique"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Votre message ne peut être envoyé tant que vous n'êtes pas connecté."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 msgid "Underline"
 msgstr "Souligné"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 msgid "Strike"
 msgstr "Barré"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr "Police"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 msgid "Clear formating"
 msgstr "Style par défaut"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Êtes vous sûr de vouloir envoyer le fichier ?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Si vous envoyez un fichier à %s, il/elle connaîtra votre véritable "
 "identifiant Jabber."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "Chiffrement GPG activé"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Absent de la liste"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Une liste des transferts de fichier actifs, terminés et arrêtés"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Artiste Inconnu"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Titre Iconnu"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Source Inconnue"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3171,17 +3146,17 @@ msgstr ""
 "<b>« %(title)s »</b> par <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s du salon de discussion %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Aucune clef GPG assignée"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3189,50 +3164,50 @@ msgstr ""
 "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
 "chiffrer les messages avec GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "Chiffrement GPG désactivé"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "La session SERA archivée"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "La session ne sera PAS archivée"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "est"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "N'est PAS"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "sera"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "NE sera PAS"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "et authentifiée"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "et NON authentifiée"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3241,66 +3216,23 @@ msgstr ""
 "Chiffrement %(type)s %(status)s actif %(authenticated)s.\n"
 "Votre discussion %(logged)s archivée."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Commande non prise en charge pour les comptes zeroconf."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Commandes : %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Usage : /%s, nettoie la fenêtre."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Usage: /%s, cache les boutons de discussion."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Utilisation : /%(command)s <action>, envoie l'action au salon actuel. "
-"Utilise la troisième personne. (ex : /%(command)s explose.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Utilisation : /%s, envoie un ping au contact"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Usage: /%s, envoie le message au contact"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Pas d'aide disponible pour /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Négociation annulée"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Cette session est chiffrée"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " et SERA archivée"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " et NE SERA PAS archivée"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3308,25 +3240,25 @@ msgstr ""
 "Identité du contact non vérifiée. Cliquez sur le bouton bouclier pour plus "
 "de détails."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "Chiffrement E2E désactivé"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Le message suivant n'a PAS été chiffré"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Le message suivant n'a été chiffré"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vous venez de recevoir un nouveau message de \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3334,15 +3266,15 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Erreur de base de données"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3351,7 +3283,7 @@ msgstr ""
 "Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer ou "
 "supprimez le (toutes les archives seront perdues)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s est maintenant %(status)s"
@@ -3360,23 +3292,23 @@ msgstr "%(name)s est maintenant %(status)s"
 msgid "creating logs database"
 msgstr "création de la base de donnée de l'historique"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s est un fichier mais devrait être un répertoire"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim va maintenant s'arrêter"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s est un répertoire mais devrait être un fichier"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "crée le répertoire %s"
@@ -3440,9 +3372,9 @@ msgstr "Choisissez les groupes de discussion que vous voulez quitter"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Salons de discussion"
 
@@ -3458,49 +3390,94 @@ msgstr "Transférer les messages non-lus"
 msgid "All unread messages have been forwarded."
 msgstr "Tous les messages non-lus ont été transmis."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Utiliser DBus et Notification-Daemon pour afficher les notifications"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Temps en minutes, au bout duquel votre état basculera absent(e)."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Absent(e) car inactif depuis plus de $T min)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S sera remplacé par le message de statut, $T par le temps d'auto-absence"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Temps en minutes après lequel votre état basculera non disponible."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Non disponible car inactif depuis plus de $T min)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S sera remplacé par the message de statut, $T par le temps d'auto-idle"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Nom d'utilisateur invalide"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "texte du message d'état :"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Nom d'utilisateur invalide"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Changement de Surnom"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "texte du message d'état :"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3508,21 +3485,17 @@ msgstr ""
 "repliés."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "Par défaut"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Activer la messagerie link-local/zeroconf "
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Langue utilisée par le vérificateur orthographique"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3533,7 +3506,7 @@ msgstr ""
 "minute.\n"
 "'never' - ne jamais afficher l'heure."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3545,19 +3518,19 @@ msgstr ""
 "valeur 0. Ceci est utilisé seulement lorsque la valeur de print_time est "
 "'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 "Traiter les paires de * / _ comme des éventuels caractères de formatage."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si vrai ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer "
 "les * *"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3567,7 +3540,7 @@ msgstr ""
 "Pour la syntaxe voir http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (si vous voulez utiliser cela, installez docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3575,7 +3548,7 @@ msgstr ""
 "Caractère à ajouter après un surnom en utilisant la complétion automatique "
 "(tab) dans un salon de discussion."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3583,7 +3556,7 @@ msgstr ""
 "Caractère ajouté automatiquement après un surnom s'il est déjà utilisé dans "
 "un salon de discussion."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3594,19 +3567,19 @@ msgstr ""
 "documentation python de strftime pour une documentation complète : http://"
 "docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Caractères affichés avant le surnom dans les conversations"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Caractères affichés après le surnom dans les conversations"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3614,12 +3587,26 @@ msgstr ""
 "Nombre de lignes de l'historique à afficher lorsque l'onglet ou la fenêtre "
 "de discussion est ouvert à nouveau."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Durée de vie en minutes des dernières lignes des conversations précédentes."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3627,13 +3614,13 @@ msgstr ""
 "Envoyer le message avec Ctrl+Entrée et aller à la ligne avec Entrée "
 "(comportement par défaut du client ICQ de Mirabilis)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr ""
 "Nombre de lignes à stocker pour le rappel des lignes précédentes (avec Ctrl"
 "+flèche vers le haut)."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3642,13 +3629,13 @@ msgstr ""
 "Soit une url personnalisée contenant %s où %s est le mot/la phrase, soit "
 "\"WIKTIONARY\", ce qui signifie l'utilisation de wikitionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si cette case est cochée, Gajim pourra être contrôlé à distance via gajim-"
 "remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3659,13 +3646,13 @@ msgstr ""
 "automatiquement l'état des comptes (en autant que listen_to_network_manager "
 "n'est pas désactivé et qu'ils soient synchronisés à l'état global)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notifications d'états envoyées. Peut être all, composing_only ou disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3673,7 +3660,7 @@ msgstr ""
 "Notifications d'états affichées dans les fenêtres de conversations. Peut "
 "être all, composing_only ou disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3681,12 +3668,12 @@ msgstr ""
 "Au lieu d'afficher l'heure à chaque message (print_time==sometimes), "
 "l'afficher toutes les x minutes."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Demander avant de fermer un onglet ou une fenêtre de discussion de salon."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3694,7 +3681,7 @@ msgstr ""
 "Toujours demander avant de fermer les onglets/fenêtres de salons de cette "
 "liste séparés par des espaces."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3702,13 +3689,13 @@ msgstr ""
 "Ne jamais demander avant de fermer onglets/fenêtres des salons de cette "
 "liste séparées par des espaces."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3717,27 +3704,27 @@ msgstr ""
 "interfaces locales, pour les transferts de fichiers dans le cas de "
 "traduction  d'adresse / redirection de port."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "D'après le standard IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "M'alerter à l'aide de l'icône dans la zone de notifications."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Afficher la bordure fenêtres de discussion à onglets ?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Afficher le bouton fermer sur l'onglet ?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3750,18 +3737,18 @@ msgstr ""
 "sécurisés, mais prennent plus de temps pour le calcul quand vous commencez "
 "une session."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Aperçu des nouveaux messages dans un popup ?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Une liste de mots séparés par des points-virgules qui seront mis en "
 "surbrillance dans les salons."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3770,14 +3757,14 @@ msgstr ""
 "fenêtre. Cette option n'est prise en compte que si l'icône dans la barre de "
 "notification est utilisée."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Si vrai, Gajim vérifiera qu'il est le client Jabber par défaut à chaque "
 "démarrage."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3785,7 +3772,7 @@ msgstr ""
 "Si vrai, Gajim affichera dans chaque onglet une icône contenant les messages "
 "non lus. En fonction du thème, cette icône peut être animée."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3793,13 +3780,13 @@ msgstr ""
 "Si Vrai, Gajim affichera le message d'état, s'il n'est pas vide, sous le nom "
 "de chaque contact dans la liste des contacts."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Définir la position de l'avatar dans le roster. Peut être à droite (right) "
 "ou à gauche (left)."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3807,7 +3794,7 @@ msgstr ""
 "Si Vrai demandera son avatar à chaque contact qui n'en avait pas la fois "
 "précédente ou dont la version en cache a expiré."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3815,7 +3802,7 @@ msgstr ""
 "Si Faux, vous ne verrez plus les lignes d'état dans les conversations quand "
 "un contact modifie son état et/ou son message d'état."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3830,32 +3817,32 @@ msgstr ""
 "affichera seulement « TRUC vient de rejoindre/quitter le groupe de discussion "
 "»."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 "Couleur d'arrière-plan des contacts lorsqu'ils viennent de se connecter."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 "Couleur d'arrière-plan des contacts lorsqu'ils viennent de se déconnecter."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Si Vrai, les messages restaurés utiliseront une police de texte plus petite "
 "que la normale."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne pas afficher d'avatars particuliers pour les passerelles."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne pas afficher d'icône dans la barre des tâches."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3865,7 +3852,7 @@ msgstr ""
 "clignoter (comportement par défaut dans la plupart des gestionnaires de "
 "fenêtres) la fenêtre quand elle contient des événements non lus."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3876,7 +3863,7 @@ msgstr ""
 "l'information sha dans les salons."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3895,36 +3882,36 @@ msgstr ""
 "'pertype' - Toutes les conversations d'un même type (discussion, salon) dans "
 "la même fenêtre."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Si Faux, vous ne verrez plus les avatars dans les fenêtres de conversation."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Si Vrai, appuyer sur la touche d'échappement fermera l'onglet ou la fenêtre "
 "de conversation."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Cacher les boutons dans les fenêtres de conversations."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Cacher les boutons dans la fenêtre de discussion"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Cache la bannière dans les fenêtres de discussions"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Cache la liste des occupants du salon dans les fenêtres des salons de "
 "discussion."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3932,15 +3919,15 @@ msgstr ""
 "Dans une conversation, affiche le surnom au début d'une ligne seulement "
 "lorsque ce n'est pas la même personne qui a écrit le dernier message."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation lors du fusionnement d'un surnom répété."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Défilement doux dans la fenêtre de conversation"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3948,13 +3935,13 @@ msgstr ""
 "Liste des couleurs, séparées par « : », qui seront utilisées pour colorier "
 "les surnoms dans les salons de discussion."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab pour basculer au prochain onglet lorsqu'aucun d'entre eux n'a de "
 "nouveaux messages non lus."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3963,7 +3950,27 @@ msgstr ""
 "métacontacts ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
 "affiché."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Doit-on afficher le dialogue de confirmation de la création de "
+"métacontacts ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
+"affiché."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Doit-on afficher le dialogue de confirmation de la création de "
+"métacontacts ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
+"affiché."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3974,7 +3981,7 @@ msgstr ""
 "connecté avec une priorité négative, vous ne recevrez AUCUN message en "
 "provenance de votre serveur."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3982,7 +3989,7 @@ msgstr ""
 "Si vrai, Gajim va utiliser Gnome Keyring (s'il est disponible) pour stocker "
 "les mots de passe des comptes."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3991,7 +3998,7 @@ msgstr ""
 "Si vrai, Gajim va utiliser Gnome Keyring (s'il est disponible) pour stocker "
 "les mots de passe des comptes."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3999,7 +4006,7 @@ msgstr ""
 "Si vrai, Gajim montrera le nombre de contacts connectés et totaux sur les "
 "lignes de groupe et de compte"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4007,7 +4014,7 @@ msgstr ""
 "Peut être vide, 'chat' ou 'normal'. Si non vide, traite tous les messages "
 "entrant comme des messages de ce type"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4015,7 +4022,7 @@ msgstr ""
 "Si Activé, Gajim scrollera et sélectionnera le contact qui vous a envoyé le "
 "dernier message, si la fenêtre de conversation n'est pas déjà ouverte."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -4024,13 +4031,13 @@ msgstr ""
 "image, en utilisant dvips et convert avant de l'insérer dans la fenêtre de "
 "conversation."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Temps d'inactivité nécessaire pour que la fenêtre de changement de statut se "
 "faire."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4038,7 +4045,7 @@ msgstr ""
 "Nombre maximum de lignes affichées dans les conversations. Les lignes les "
 "plus vieilles sont effacées."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4046,12 +4053,12 @@ msgstr ""
 "Si Activé, les fenêtres de notification du notification-daemon seront "
 "attachées à l'icône du Tray."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Choisissez l'intervalle en secondes entre deux vérifications de l'inactivité."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4059,7 +4066,7 @@ msgstr ""
 "Modifiez la valeur pour changer la taille des formules latex affichées. Plus "
 "la valeur est grande, plus la taille l'est."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4068,13 +4075,23 @@ msgstr ""
 "Schémas d'uri valides. Seuls les schémas dans cette liste seront acceptés "
 "comment « vraies » uri."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4082,7 +4099,7 @@ msgstr ""
 "La priorité va changer automatiquement selon votre état. Les priorités sont "
 "définies dans les options autopriority_*."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4092,28 +4109,40 @@ msgstr ""
 "(indisponible), dnd (Occupé(e)) ou Invisible. NOTE : cette option n'est "
 "utilisée que si l'option restore_last_status est désactivée"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Si activé, restaure le dernier statut qui était utilisé."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Si Faux, vous ne verrez plus les avatars dans les fenêtres de conversation."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Si désactivé, ne pas signaler les présences avec une clef GPG, même si GPG "
 "est configuré."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Activer le chiffrage ESessions pour ce compte."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Gajim doit-il commencer automatiquement une discussion chiffrée quand cela "
 "est possible ?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4121,32 +4150,32 @@ msgstr ""
 "Liste ordonnée de types de connexion, séparés par des virgules, à essayer. "
 "Peut contenir tls, ssl ou plain."
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Afficher un message d'avertissement avant d'envoyer un mot de passe via une "
 "connexion non-chiffrée."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Afficher un message d'avertissement avant d'utiliser la librairie SSL "
 "standard."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Liste d'erreurs ssl, séparées par une virgule, à ignorer."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4156,11 +4185,11 @@ msgstr ""
 "Connexion avant de tenter de se connecter."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Contournement de bug de jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4168,15 +4197,15 @@ msgstr ""
 "Si cette case est cochée, Gajim utilisera votre IP et les proxies définis "
 "dans l'option file_transfer_proxies pour les transferts de fichiers."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Répondre aux demandes d'accusés de réception"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Envoyer des demandes d'accusés de réception"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4184,11 +4213,11 @@ msgstr ""
 "Durant la négociation d'une session chiffrée, Gajim doit-il partir du "
 "principe que vous voulez archiver vos conversations ?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Est-ce que OpenPGP est activé pour ce contact ?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4196,101 +4225,101 @@ msgstr ""
 "Gajim doit-il commencer automatiquement une discussion chiffrée avec ce "
 "contact quand cela est possible ?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Langue dans laquelle faire la vérification orthographique"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "tous ou par état (séparé par des espaces)"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ou 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ou ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Dort"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Travaille"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Je suis sorti profiter de la vie."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Disponible"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Non disponible"
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Ne pas déranger."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Au revoir !"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4298,101 +4327,101 @@ msgstr ""
 "Son à jouer lorsqu'un message de salon contient un des mots de "
 "muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son émis lors de l'arrivée d'un message de salon de discussion."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "vert"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Impossible de charger le module d'inactivité"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Hôte erroné"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Adresse locale invalide ? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "S'enregistrer à %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "La connexion a échoué"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Erreur d'Écriture du disque"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Invisibilité non-supportée"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Le compte %s ne supporte pas l'invisibilité."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4402,77 +4431,84 @@ msgstr ""
 "(voir http://trac.gajim.org/wiki/DatabaseBackup) ou supprimez le (toutes les "
 "archives seront perdues)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Surnom invalide : %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Vous êtes banni du salon %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Le salon %s n'existe pas."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Votre pseudonyme enregistré doit être utilisé dans le salon %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vous n'êtes pas dans la liste des membres du salon %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Le salon de discussion a été détruit"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Vous pouvez rejoindre le salon %s à la place"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4482,224 +4518,210 @@ msgstr ""
 "à votre liste de contacts. Utilisez un outil de gestion de liste de contact "
 "tel que http://jru.jabberstudio.org pour le supprimer"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Mot de passe OpenPGP non renseigné"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Vous serez connecté à %s sans OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Impossible d'obtenir le certificat de l'émetteur "
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Impossible d'obtenir un certificat CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Impossible de déchiffrer la signature du certificat"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Impossible de déchiffrer la signature du CRL"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de déchiffrer la clef public de l'émetteur"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Échec de la signature du certificat"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Échec de la signature CRL"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Le certificat n'est pas encore valide"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Le certificat a expiré"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL n'est pas encore valide"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL a expiré"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Erreur de format dans le champ notBefore du certificat"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Erreur de format dans le champ notAfter du certificat"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erreur de format dans le champ lastUpdate du CRL"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erreur de format dans le champ nextUpdate du CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Mémoire insuffisante"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Certificat auto-signé"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificat auto-signé dans la chaîne de certificat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Impossible de récupérer le certificat de l'émeteur local"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Impossible de vérifier le premier certificat"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Chaîne du certificat trop longue"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Certificat révoqué"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Certificat CA invalide"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Longueur du chemin dépassée"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Objet du certificat non-supporté"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Certificat non approuvé"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Certificat refusé"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Décalage du sujet de l'émetteur"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Décalage dans les clés d'identification de l'authorité et du sujet"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Décalage dans les numéros de série de l'authorité et du sujet"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "L'utilisation de la clé n'inclut pas la signature d'un certificat"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Echec de la vérification de l'application"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Reconnecter manuellement."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Le serveur %(name)s a mal répondu à la requête d'enregistrement : %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Le serveur %s a fourni une forme d'inscription différente"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erreur SSL inconnue : %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Réponse non valide"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "La passerelle %(name)s a mal répondu à la requête d'enregistrement : %(error)"
 "s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Enregistré dans : %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "La connexion au proxy a échoué"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossible de se connecter au compte %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "La connexion avec le compte %s a été perdue. Essayez de vous connecter à "
 "nouveau."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "L'authentification du certificat %s peut être invalide."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4708,7 +4730,7 @@ msgstr ""
 "\n"
 "Erreur SSL : <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4717,24 +4739,24 @@ msgstr ""
 "\n"
 "Erreur SSL inconnue : %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Une erreur s'est produite pendant la suppression de la liste privée"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4743,18 +4765,18 @@ msgstr ""
 "La liste privée %s n'a pas été supprimée. Elle est peut-être active dans une "
 "des ressources connectées. Désactivez la et réessayez."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Le présence distante n'est pas signée et aucune clef n'a été assignée."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4762,12 +4784,12 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ce message est *chiffré* (Voir : XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4776,30 +4798,40 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Inviter des _Contacts"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Non récupéré à cause du statut invisible"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "La connexion a échoué"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Observateurs"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Passerelles"
 
@@ -4809,14 +4841,19 @@ msgstr "Pas dans la liste"
 
 # Traduction moins mauvaise mais pas terrible: binding=lier, attacher
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "La passerelle python - D-Bus n'est pas installée sur cet ordinateur"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Les possibilités D-Bus de Gajim ne peuvent pas être utilisées"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (ou python-pysqlite2) n'est pas installé. Quitte..."
@@ -4891,56 +4928,69 @@ msgid "eleven"
 msgstr "onze"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s heure"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s heure cinq"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s heure dix"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s heure et quart"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s heure vingt"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s heure vingt cinq"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s heure et demi"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "%(1)s heure moins vingt cinq"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "%(1)s heure moins vingt"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "%(1)s heure moins le quart"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "%(1)s heure moins dix"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "%(1)s heure moins cinq"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s heure"
 
@@ -5008,224 +5058,224 @@ msgstr "Caractère non valide dans le nom d'hôte."
 msgid "Invalid character in resource."
 msgstr "Caractère non valide dans la ressource."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "O_ccupé(e)"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Occupé(e)"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Disponible"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Disponible"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "_Absent(e)"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "Déc_onnecté(e)"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Déconnecté(e)"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "en erreur"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "À"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Les deux"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Aucun"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Aucune"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Membre"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "écrit un message..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gio"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mio"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s Kio"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message en attente"
 msgstr[1] "%d messages en attente"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " du salon %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr "de l'utilisateur %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr "de %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d évènement en attente"
 msgstr[1] "%d événements en attente"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Erreur en exécutant « %(command)s » : %(error)s"
@@ -5241,11 +5291,11 @@ msgstr "%s n'est pas un loglevel valide"
 msgid "error: cannot open %s for reading"
 msgstr "erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "migration de la base de données de l'historique vers des index"
 
@@ -5897,7 +5947,7 @@ msgstr ""
 "transfert de fichiers sera annulé."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5905,7 +5955,7 @@ msgstr ""
 "[Ceci fait partie d'une session chiffrée. Si vous voyez ce message, un "
 "problème a eu lieu.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5914,17 +5964,29 @@ msgstr ""
 "L'hôte %s que vous avez spécifié dans l'option avancée "
 "« ft_add_hosts_to_send » est invalide, il a été ignoré."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Mot de passe OpenPGP non renseigné"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Vous serez connecté à %s sans OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pour continuer à envoyer et recevoir des messages, vous devez vous "
 "reconnecter."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Erreur d'Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5933,31 +5995,31 @@ msgstr ""
 "%s\n"
 "La messagerie en « link-local » pourrait ne pas fonctionner correctement."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Veuillez vérifier si Avahi ou Bonjour sont installés."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Impossible de lancer le service local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de débloquer le port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Vérifiez si avahi-daemon est actif."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossible de changer l'état du compte « %s »"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5966,20 +6028,20 @@ msgstr ""
 "être envoyé."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Ce message est chiffré]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Votre message n'a pas pu être envoyé."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Le destinataire est déconnecté. Votre message n'a pas pu être envoyé."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5992,24 +6054,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erreur en ajoutant le service. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Message par défaut"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Le dictionnaire pour la langue %s est indisponible"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6018,213 +6080,219 @@ msgstr ""
 "Vous devez installer le dictionnaire %s pour la vérification orthographique, "
 "ou choisir un autre langage en paramétrant l'option speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "texte du message d'état :"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Reconnecter maintenant ?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Si vous voulez que vos changements soit appliqués immédiatement, vous devez "
 "vous reconnecter."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Événements non lus"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Lisez tous les événements avant de supprimer ce compte."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vous avez une conversation ouverte dans le compte %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Toutes les fenêtres de conversation et de salons de discussion seront "
 "fermées. Voulez-vous continuer ?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Pour changer le nom du compte, vous devez être déconnecté."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "Pour changer le nom du compte, vous devez lire tous ses événements."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ce nom est déjà utilisé par un autre de vos comptes. Choisissez un autre nom."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Renommer le compte"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entrez un nouveau nom pour le compte %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un Identifiant Jabber doit être de la forme \"user@servername\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr ""
 "Il y a eu un problème durant la récupération de vos clés OpenPGP secrètes."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Vous devez d'abord créer votre compte avant d'éditer vos informations."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Votre serveur ne supporte pas les Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Votre serveur ne peut enregistrer d'informations personnelles."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Pour changer le nom du compte, vous devez être déconnecté."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Ce compte existe déjà localement."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Veuillez le renommer et l'enlever avant d'activer la messagerie link-local."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Liste des bannis"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Liste des membres"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Liste des propriétaires"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Liste des administrateurs"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "Identifiant Jabber"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Raison"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Rôle"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Bannissement de ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6232,11 +6300,11 @@ msgstr ""
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6244,11 +6312,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6256,11 +6324,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un possesseur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6268,7 +6336,7 @@ msgstr ""
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6286,124 +6354,123 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Tout"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Entrées et sorties seulement"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "Aucun"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Créer un salon de discussion"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page"
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Surnom invalide : %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Serveur invalide"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Vous pouvez configurer les options avancées en cliquant sur le bouton "
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Vous devez entrer un nom d'utilisateur pour configurer ce compte."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Saisissez un serveur sur lequel vous voulez vous enregistrer."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Certificat déjà dans un Fichier"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ce certificat est déjà dans le fichier %s, il n'a donc pas été ajouté."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6418,7 +6485,7 @@ msgstr ""
 "Erreur SSL  %(error)s\n"
 "Voulez vous toujours vous connecter au serveur ?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6429,63 +6496,63 @@ msgstr ""
 "Empreinte digitale SHA1 du certificat :\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Premier message reçu"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Message Reçu Suivant Avec le Focus."
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Message Reçu Suivant Sans le Focus"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Contact connecté"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Contact déconnecté"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Message envoyé"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un salon mis en surbrillance"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Message reçu dans un salon"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Courriel Gmail reçu"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6495,7 +6562,7 @@ msgstr ""
 "été reçu par le contact distant. Si cette icône reste\n"
 "pendant un long moment, le message a probablement été perdu."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6503,77 +6570,77 @@ msgstr ""
 "Le texte sous cette règle correspond à ce qui a été dit depuis\n"
 "la dernière fois que vous avez consulté ce salon de discussion"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Quitter"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Il manque un \"%s\" dans l'URL de recherche sur Internet"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Ouvrir en tant que _lien"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Hier"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "Il y a %i jours"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Identifiant Jabber déjà existant"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 "L'identifiant Jabber que vous avez entré est déjà dans la liste. Veuillez en "
 "choisir un autre."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "nouveau@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nouveau%d@jabber.id"
@@ -6608,124 +6675,124 @@ msgstr "Nom du contact"
 msgid "Set Mood"
 msgstr "Définir l'Humeur"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d'état %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Message d'état"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Remplacer le message de statut ?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ce nom est déjà utilisé. Voulez vous remplacer ce message de statut ?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Enregistrer comme messages d'état prédéfini"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Tapez un nom pour ce message d'état"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "Adresse AIM :"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Numéro GG :"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Numéro ICQ :"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "Adresse MSN :"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Adresse Yahoo! :"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Remplissez les informations sur le contact à ajouter au compte %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Vous ne pouvez pas vous ajouter à votre propre roster."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Identifiant :"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Version de GTK+ :"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Version de PyGTK :"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Développeurs actuels :"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "MERCI :"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Pour finir, nous voulons remercier tous les mainteneurs de paquet."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Yann Le Boulanger <asterix@lagaule.org>\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>\n"
 "Florent Le Coz <louizatakk@fedoraproject.org>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6738,93 +6805,103 @@ msgstr ""
 "\n"
 "Le soulignement des fautes d'orthographe ne sera pas utilisé"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Le pseudonyme contient des caractères non autorisés."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Requête d'inscription pour le compte %(account)s de la part de %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas "
 "connecté."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Nom de compte invalide"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Le compte avec lequel vous voulez entrer dans le salon"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Identifiant Jabber de salon invalide"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "L'identifiant jabber du salon de discussion contient des caractères "
 "interdits."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Ceci n'est pas une conversation multi-utilisateurs"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s n'est pas un nom de salon de discussion valide"
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Ce compte est connecté au serveur"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Vous ne pouvez pas vous synchroniser avec un compte sauf s'il est connecté."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Synchroniser"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6833,300 +6910,300 @@ msgstr ""
 "envoyer un message :"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossible d'interpréter \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nouveau message"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nouveau courrier électronique"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de fichier"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Le contact a changé d'état"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Message simple dans le compte %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr ""
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Morose"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Identifiant Jabber :"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Groupe"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste privée <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste privée pour %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ordre : %(order)s, action : %(action)s, type : %(type)s, valeur : %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordre : %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifier une règle</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ajouter une règle</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listes privées pour %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Listes privées"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Nom de liste invalide"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Vous devez entrer un nom pour créer une liste privée."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes invité(e) dans un groupe de discussion"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vous a invité dans un salon de discussion"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact vous a invité dans le salon de discussion %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Voulez-vous accepter l'invitation ?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quand %s devient :"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Ajout de notifications spéciales pour %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "quand je suis "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7137,19 +7214,19 @@ msgstr ""
 "\n"
 "La Short Authentication String cette session est <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Vous avez déjà vérifié l'identité de ce contact."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Identité du contact vérifiée"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Vérifier à nouveau..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7159,19 +7236,19 @@ msgstr ""
 "messages et vous en envoyer, vous devez vérifier son identité en cliquant "
 "sur le bouton en-dessous."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Identité du contact NON vérifiée"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Vérifier..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Avez-vous vérifié l'identité du contact ?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7186,24 +7263,24 @@ msgstr ""
 "\n"
 "La Short Authentication String de cette session est : <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Avec vous parlé au contact et vérifié la SAS ?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "La clef du contact (%s) <b>ne correspond pas</b> à la clef assignée dans "
 "Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
 "chiffrer les messages."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7212,7 +7289,7 @@ msgstr ""
 "sa clef</b>, les messages <b>ne peuvent</b> donc <b>pas</b> être chiffrés. "
 "Utilisez votre client GPG pour avoir confiance en cette clef."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7308,20 +7385,20 @@ msgstr "Description"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Marque-page déjà spécifié"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Marque-page ajouté avec succès"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
@@ -7335,15 +7412,15 @@ msgstr "Inscrit"
 msgid "Node"
 msgstr "Nœud"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Nouvel article"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Désinscrire"
 
@@ -7808,31 +7885,31 @@ msgstr "Gajim a besoin d'un serveur X pour démarrer. Fermeture..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim a besoin de PyGTK 2.8 ou supérieur pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim a besoin de GTK 2.8 ou supérieur"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim a besoin de GTK 2.8 ou supérieur pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7841,22 +7918,22 @@ msgstr ""
 "Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
 "dernière version stable à partir de %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Vérifiez que GTK+ et PyGTK contiennent le support de glade dans votre "
 "système."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim a besoin de pywin32 pour s'exécuter"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7864,11 +7941,11 @@ msgid ""
 msgstr "Assurez-vous que Pywin32 est installé. Vous pouvez l'obtenir ici : %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim est déjà en cours d'exécution"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7876,36 +7953,36 @@ msgstr ""
 "Gajim semble déjà être en cours d'exécution\n"
 "Démarrer quand même ?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Entrez votre mot de passe GPG pour la clé %(keyid)s (compte %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Aucune clef GPG assignée"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Vous serez connecté à %s sans OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Mot de passe erroné"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7916,59 +7993,59 @@ msgstr ""
 "utilisé ou enregistré par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acceptez vous cette requête sur le compte %s ?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorisation HTTP (%(method)s) pour %(url)s (id : %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "La connexion a échoué"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erreur %(code)s : %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erreur en envoyant %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Requête d'Inscription"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Le contact \"%s\" vous a autorisé à voir son état."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7976,80 +8053,80 @@ msgstr ""
 "Vous le/la verrez toujours hors-ligne.\n"
 "Voulez vous le/la supprimer de votre liste de contacts ?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Désinscrire"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s est maintenant connu en tant que %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s est maintenant %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s a changé le sujet en %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 "N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Le salon affiche dorénavant les membres non-disponibles"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "Le salon n'affiche plus les membres non-disponibles"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Un changement de la configuration du salon relatif à la vie-privée a eu lieu"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "L'enregistrement des conversations du salon est maintenant activé"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Le salon n'est plus anonyme"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Le salon est maintenant sami-anonyme"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Le salon est maintenant totalement anonyme"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8057,20 +8134,25 @@ msgstr ""
 "Vous avez configuré Gajim pour qu'il utilise un agent GPG, mais aucun agent "
 "GPG n'est lancé ou il a renvoyé un mauvais mot de passe.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Votre mot de passe est incorrect"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG n'est pas utilisable"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -8079,13 +8161,14 @@ msgstr ""
 "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
 "chiffrer les messages."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Ne plus me poser la question"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8094,19 +8177,19 @@ msgstr ""
 "Gnome Keyring est installé mais pas \t\t\t\t\t\t\tcorrectement démarré "
 "(variable d'environnement probablement \t\t\t\t\t\t\tmal configurée)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nouveau courriel sur %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Vous avez %d nouveau courrier électronique"
 msgstr[1] "Vous avez %d nouveaux courriers électroniques"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8121,45 +8204,45 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Enlever le contact de la liste"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erreur de lecture du fichier :"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8168,36 +8251,36 @@ msgstr ""
 "Impossible de déchiffrer le message de %s\n"
 "Il a peut-être été manipulé."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Impossible de déchiffrer le message"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Conflit de nom d'utilisateur"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping ?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong ! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Erreur."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8205,11 +8288,11 @@ msgstr ""
 "Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en "
 "entrer une nouvelle"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Erreur durant la vérification du certificat SSL"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8220,15 +8303,15 @@ msgstr ""
 "serveur Jabber : %(error)s\n"
 "Voulez-vous toujours vous connecter à ce serveur ?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer cette erreur pour ce certificat."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Erreur de certificat SSL"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8246,11 +8329,11 @@ msgstr ""
 "Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du "
 "certificat ?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Connexion non-sécurisée"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8258,11 +8341,11 @@ msgstr ""
 "Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
 "chiffrée. Êtes vous sûr de vouloir le faire ?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8271,21 +8354,21 @@ msgstr ""
 "sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
 "sûr de vouloir le faire ?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "Le nœud PEP n'a pas été supprimé"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Le nœud PEP %(node)s n'a pas été supprimé : %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Émoticônes désactivées"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8293,7 +8376,7 @@ msgstr ""
 "Votre thème d'émoticônes n'a pu être trouvé, les émoticônes sont donc "
 "désactivées."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8303,7 +8386,7 @@ msgstr ""
 "mettre à jour le format du fichier emoticons.py. Voir http://trac.gajim.org/"
 "wiki/Emoticons pour plus de détails."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
@@ -8311,7 +8394,7 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos informations de configuration"
 
@@ -8345,12 +8428,13 @@ msgstr ""
 "sur une ligne séparée"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "compte"
 
@@ -8375,9 +8459,9 @@ msgstr "état"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "message"
 
@@ -8395,24 +8479,49 @@ msgstr ""
 "l'état global\" activée"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Change l'état du ou des compte(s)"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_té :"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Je veux _créer un nouveau compte"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"Change l'état du compte \"compte\". Si aucun n'est spécifié, essaye de "
+"changer l'état de tous les compte qui ont l'option \"synchroniser avec "
+"l'état global\" activée"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Montre la fenêtre de discussion pour que vous puissiez envoyer un message à "
 "un contact"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "L'identifiant Jabber du contact avec lequel vous voulez discuter"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8422,29 +8531,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez seulement renseigner le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "L'identifiant Jabber du contact qui recevra le message"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "contenu du message"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "clé pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Si spécifié, le message sera chiffré en utilisant cette clé publique"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "Si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8454,135 +8563,135 @@ msgstr ""
 "et le compte sont facultatifs. Si vous voulez seulement renseigner le "
 "paramètre 'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "sujet"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "sujet du message"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Envoie un nouveau message à un salon que vous avez rejoint."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "L'identifiant Jabber du salon qui recevra le message"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "L'identifiant Jabber du contact"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Récupère les informations détaillées d'un compte"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nom du compte"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Envoyer un fichier à un contact"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fichier"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Chemin du fichier"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Liste toutes les préférences et leurs valeurs"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Définir la valeur de 'clé' à 'valeur'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'clé' est le nom de la préférence, 'valeur' est la valeur à assigner"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Supprime une option de préférence"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "touche"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nom de la préférence a supprimer"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Écrit les préférences actuelles de Gajim dans le fichier .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Enlever le contact de la liste"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Ajouter le contact à la liste"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "identifiant Jabber"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Ajoute un nouveau contact à ce compte"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Renvoit l'état actuel (global à moins qu'un compte ne soit spécifié)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Renvoie le message d'état actuel (global à moins qu'un compte ne soit "
 "spécifié)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Renvoie le nombre de messages non-lus"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ouvre la fenêtre « Commencer une discussion »"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Commencer une discussion en utilisant ce compte"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Envoyer du XML personnalisé"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML à envoyer"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8590,72 +8699,72 @@ msgstr ""
 "Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
 "à tous les comptes"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Gère une URI du type xmpp:"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI à gérer"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Compte avec lequel vous voulez le gérer"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "contenu du message"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Joindre un groupe de discussions"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "groupe de discussion"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "JID du salon"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "pseudonyme"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Surnom à utiliser"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "mot de passe"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Mot de passe pour entrer dans le salon"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Le compte avec lequel vous voulez entrer dans le salon"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Vérifie si Gajim est lancé"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Montre ou cache la fenêtre ipython"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8664,17 +8773,17 @@ msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
 "Précisez le compte pour envoyer le message."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Il semble que Gajim ne soit pas lancé. Vous ne pouvez donc pas utiliser "
 "gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8683,16 +8792,16 @@ msgstr ""
 "Utilisation : %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8701,7 +8810,7 @@ msgstr ""
 "Utilisation : %s commande [arguments]\n"
 "commande est l'une de :\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8710,7 +8819,7 @@ msgstr ""
 "Trop d'arguments.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8719,7 +8828,7 @@ msgstr ""
 "L'argument \"%(arg)s\" n'est pas précisé.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Mauvaise adresse (URI)"
 
@@ -8749,291 +8858,150 @@ msgid "Please first choose another for your current theme."
 msgstr ""
 "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Vous n'êtes plus dans le salon « %(room)s » ou « %(nick)s » l'a quitté."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Conversation avec "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Conversation continuée"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "L'enregistrement des conversations du salon est activé"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Le serveur à défini ou midifié votre Surnom de salon"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a été banni par %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s a été éjecté du salon (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "Changement d'affiliation"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "La configuration du salon a changé pour « membres seulement »"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "Extinction du système"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** L'affiliation de %(nick)s a été définie à %(affiliation)s par %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** L'affiliation de %(nick)s a été définie à %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Le rôle de %(nick)s a été défini à %(role)s par %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Le rôle de %(nick)s a été défini à %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s a rejoint le salon de discussion"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Surnom introuvable : %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Ce salon de discussion n'a pas de sujet"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr ""
-"Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Surnom introuvable : %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Utilisation : /%s <surnom|identifiant Jabber> [raison], bannit l'identifiant "
-"Jabber du salon. Le surnom de l'occupant peut être utilisé s'il ne contient "
-"pas de \"@\". Si l'identifiant Jabber est actuellement dans le salon il sera "
-"également éjecté. Ne supporte pas les espaces dans le surnom."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Usage : /%s <surnom>, ouvre une fenêtre de conversation privée avec "
-"l'occupant(e) spécifié(e)."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courant en "
-"affichant la raison si spécifiée."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Utilisation : /%s <identifiant Jabber> [raison], invite l'identifiant Jabber "
-"dans le salon actuel, la raison est optionnelle."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
-"salon@serveur en option on peut spécifier le surnom utilisé."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Utilisation : /%s <surnom> [raison], éjecte l'occupant portant le surnom "
-"spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
-"contenir d'espaces !"
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
-"envoie le message à l'occupant(e) spécifié(e) par le surnom."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Utilisation : /%s , affiche les noms des occupants du salon."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Utilisation : /%s <message>, envoie un message sans chercher d'autres "
-"commandes."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Si vous fermez cette fenêtre, vous serez déconnecté(e) de ce salon."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruction de %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9041,22 +9009,22 @@ msgstr ""
 "Vous êtes sur le point de supprimer définitivement ce salon.\n"
 "Vous pouvez spécifier une raison ci-dessous :"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Vous pouvez également entrer une juridiction alternative :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -9131,6 +9099,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Nouveau Salon de Discussion"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Impossible de trouver la base de données de l'historique"
@@ -9213,52 +9189,62 @@ msgstr "Historique de conversation avec %s"
 msgid "Disk Error"
 msgstr "Erreur du disque"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s est maintenant %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Message d'erreur : %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Erreur."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Délai du chargement de l'image dépassé"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Voulez-vous vraiment supprimer le message sélectionné ?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Discussions"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Salons de discussion"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Messages"
 
@@ -9278,7 +9264,7 @@ msgstr "%(nick)s a changé d'état"
 #: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s s'est connecté"
+msgstr "%(nickname)s s'est connecté(e)"
 
 #: ../src/notify.py:260
 #, python-format
@@ -9319,18 +9305,18 @@ msgstr "_Ignorer"
 msgid "Retrieving profile..."
 msgstr "Récupération du profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Le fichier est vide"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Le fichier n'existe pas"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Impossible de charger l'image"
 
@@ -9362,46 +9348,46 @@ msgstr ""
 "Une erreur s'est produite lors de la publication de vos informations "
 "personnelles, veuillez réessayer plus tard."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" accepte cette requête, vous connaîtrez son état."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté(e)."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG n'est pas utilisable"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9409,28 +9395,28 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "désynchronisé"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Vous avez des messages non lus"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9438,16 +9424,16 @@ msgstr ""
 "Les messages seront disponibles pour une lecture ultérieure si l'archivage "
 "de l'historique est actif et si le contact est dans votre liste."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Vous devez les lire avant de supprimer ce compte."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9455,11 +9441,11 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Les passerelles seront enlevées"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9468,58 +9454,71 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de ces "
 "passerelles : %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir "
+"continuer ?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Renommer le contact"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entrez un nouveau surnom pour le contact %s."
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "_Renommer le Groupe"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entrez un nouveau nom pour le groupe %s."
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "_Supprimer le Groupe"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Voulez-vous enlever le groupe %s de la liste de contacts ?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 "Supprimer également de votre roster tous les contacts appartenant à ce groupe"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez la clé correspondant au contact"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Le contact \"%s\" sera enlevé de la liste de contacts"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9528,11 +9527,11 @@ msgstr ""
 "verra donc toujours déconnecté(e)."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Voulez vous continuer ?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9540,16 +9539,16 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il/Elle "
 "vous verra donc toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Autoriser ce contact à connaître mon état après la suppression"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Les contacts seront enlevés de la liste de contacts"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9559,20 +9558,35 @@ msgstr ""
 "vous enlevez aussi leurs autorisations. Ces contacts vous verront donc "
 "toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir "
+"continuer ?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Le stockage des métacontacts n'est pas supporté par votre serveur"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9581,14 +9595,14 @@ msgstr ""
 "métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
 "lors de la prochaine connexion."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir "
 "continuer ?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9598,23 +9612,23 @@ msgstr ""
 "Généralement, cela est utile lorsqu'une même personne possède plusieurs "
 "comptes Jabber ou des comptes de transport."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Url de fichier invalide :"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Voulez vous envoyer ce fichier à %s :"
 msgstr[1] "Voulez vous envoyer ces fichiers à %s :"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Envoyer %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Envoyer un fichier à un contact"
@@ -9624,115 +9638,127 @@ msgstr "Envoyer un fichier à un contact"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "du compte %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Gérer les marque-pages..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "du compte %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Publier ce que j'écoute"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Configurer les Services..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "Tout _maximiser"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "_Envoyer un message de groupe"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "À tous les utilisateurs"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "À tous les utilisateurs connectés"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Gérer les Contacts"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Éditer les _groupes"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Envoyer un message Simple"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Exécuter une commande..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Gérer les Passerelles"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Modifier la Passerelle"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Renommer"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maximiser"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Déconnecter"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Nouveau Salon de Discussion"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Déconnecter"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Joindre un salon de discussion"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
@@ -9749,20 +9775,20 @@ msgstr "Erreur dans la forme des données reçues"
 msgid "No result"
 msgstr "Aucun résultat."
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Erreur d'écriture du disque"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Sujet : %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Confirmer ces options de session"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9777,7 +9803,7 @@ msgstr ""
 "\n"
 "\tCes options sont-elles acceptables ?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9972,6 +9998,136 @@ msgstr "Il n'y a aucune requête d'inscription en attente."
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Ajouter une notification spéciale"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Assigner une clé Open_PGP"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Commande non prise en charge pour les comptes zeroconf."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Commandes : %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Usage : /%s, nettoie la fenêtre."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Usage: /%s, cache les boutons de discussion."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Utilisation : /%(command)s <action>, envoie l'action au salon actuel. "
+#~ "Utilise la troisième personne. (ex : /%(command)s explose.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Utilisation : /%s, envoie un ping au contact"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Usage: /%s, envoie le message au contact"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Pas d'aide disponible pour /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Activer la messagerie link-local/zeroconf "
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Surnom introuvable : %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Ce salon de discussion n'a pas de sujet"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr ""
+#~ "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Surnom introuvable : %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Utilisation : /%s <surnom|identifiant Jabber> [raison], bannit "
+#~ "l'identifiant Jabber du salon. Le surnom de l'occupant peut être utilisé "
+#~ "s'il ne contient pas de \"@\". Si l'identifiant Jabber est actuellement "
+#~ "dans le salon il sera également éjecté. Ne supporte pas les espaces dans "
+#~ "le surnom."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Usage : /%s <surnom>, ouvre une fenêtre de conversation privée avec "
+#~ "l'occupant(e) spécifié(e)."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courant en "
+#~ "affichant la raison si spécifiée."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Utilisation : /%s <identifiant Jabber> [raison], invite l'identifiant "
+#~ "Jabber dans le salon actuel, la raison est optionnelle."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
+#~ "salon@serveur en option on peut spécifier le surnom utilisé."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Utilisation : /%s <surnom> [raison], éjecte l'occupant portant le surnom "
+#~ "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
+#~ "contenir d'espaces !"
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
+#~ "envoie le message à l'occupant(e) spécifié(e) par le surnom."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Utilisation : /%s , affiche les noms des occupants du salon."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Utilisation : /%s <message>, envoie un message sans chercher d'autres "
+#~ "commandes."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Cliquez pour voir les fonctionnalités du serveur jabber (comme les "
diff --git a/po/gl.po b/po/gl.po
index 9ac2aef5c..9d8c596b2 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:51+0200\n"
 "Last-Translator: Iván Méndez López <>\n"
 "Language-Team:  <softwarelibre@udc.es>\n"
@@ -223,6 +223,7 @@ msgstr "<b>Información persoal</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Conta"
 
@@ -291,8 +292,8 @@ msgstr "_Editar a información persoal..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -303,8 +304,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Xeral"
 
@@ -365,25 +366,21 @@ msgid "Information about you, as stored in the server"
 msgstr "A súa información, para se gardar no servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Non se seleccionou ningunha chave"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ningún"
 
@@ -544,8 +541,8 @@ msgstr ""
 "Podería considerar mudar algúns aspectos da configuración da protección."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
@@ -559,7 +556,7 @@ msgid "Mer_ge accounts"
 msgstr "_Combinar as contas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Re_nomear"
 
@@ -827,7 +824,7 @@ msgid "All statuses"
 msgstr "Todos os estados"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Ausente"
 
@@ -844,7 +841,7 @@ msgid "Have "
 msgstr "Ten "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Invisíbel"
 
@@ -853,7 +850,7 @@ msgid "Launch a command"
 msgstr "Enviar un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Non dispoñíbel"
 
@@ -1047,7 +1044,7 @@ msgid "Join _Group Chat"
 msgstr "Entrar nun grupo de charla"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "_Engadir á listaxe de contactos"
@@ -1074,65 +1071,154 @@ msgstr "_Abrir a ligazón no navegador"
 msgid "_Start Chat"
 msgstr "_Iniciar a charla"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Con_vidar"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Observadores"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Pregunta para ver o _seu estado"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Engadir unha _notificación especial"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Asignar chave de OpenPGP"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Executar o comando..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Editar os grupos"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "Con_vidar"
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Contactos"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Eliminar"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Envía XML personalizado"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Enviar unha _mensaxe..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "Enviar ficheiro"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Iniciar a charla"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Alternar a codificación OpenPGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Alternar a codificación OpenPGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Engadir á listaxe de contactos"
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "Permitirlle ver o meu estado"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "Prohibirlle ver o meu estado"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "_Historial"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Con_vidar"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "Observadores"
+msgid "_Manage Contact"
+msgstr "Renomear o contacto"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "Renomear"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Subscrición"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "nove"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Cubrir o formulario."
@@ -1256,7 +1342,7 @@ msgstr ""
 "Contacto\n"
 "Báner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Negra"
 
@@ -1280,7 +1366,7 @@ msgstr "Marchei"
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Itálica"
 
@@ -1358,6 +1444,14 @@ msgstr "Mo_derador"
 msgid "Occupant Actions"
 msgstr "_Accións"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Enviar ficheiro"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Engadir á listaxe de contactos"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administrar"
@@ -1366,13 +1460,6 @@ msgstr "_Administrar"
 msgid "_Ban"
 msgstr "_Deshabilitar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Expulsar"
@@ -1389,13 +1476,6 @@ msgstr "_Propietario"
 msgid "_Send Private Message"
 msgstr "_Enviar unha mensaxe privada"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voz"
@@ -1404,7 +1484,7 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Crear unha publicación nova"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "De"
 
@@ -1436,8 +1516,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Xestor do Historial de Gajim"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1483,35 +1563,40 @@ msgstr "Buscar"
 msgid "_Log conversation history"
 msgstr "Historial de conversas"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Engadir esta sala aos marcadores"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 #, fuzzy
 msgid "Join this room automatically when I connect"
 msgstr "Configurar o meu perfil ao me conectar"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Alcume:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Contrasinal: "
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Entrar"
@@ -1540,7 +1625,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Amosar o estado:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -2094,7 +2179,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Ordenar os contacto_s polo estado"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Estado"
 
@@ -2268,34 +2353,39 @@ msgid "All"
 msgstr "Todos"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "todos por subscrición"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "ID de Jabber:"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Orde:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Listaxe de privacidade"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "todos por subscrición"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "todos no grupo"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2307,19 +2397,19 @@ msgstr ""
 "de\n"
 "a"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "para me enviar mensaxes"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "para me enviar preguntas"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "para me enviar o estado"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "para ver o meu estado"
 
@@ -2511,105 +2601,11 @@ msgstr "Eliminar a conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Pregunta para ver o _seu estado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Engadir unha _notificación especial"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Asignar chave de OpenPGP"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "Editar os grupos"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Executar o comando..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "Con_vidar"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Eliminar"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Envía XML personalizado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Enviar unha _mensaxe..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "Enviar ficheiro"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Iniciar a charla"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "Permitirlle ver o meu estado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "Prohibirlle ver o meu estado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "Renomear o contacto"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "Renomear"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Subscrición"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "nove"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2737,7 +2733,7 @@ msgid "_Add contact"
 msgstr "Engadir un _contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "Información"
@@ -2965,26 +2961,6 @@ msgstr "_Mensaxe"
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Engadir unha _notificación especial"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Asignar chave de OpenPGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Editar os grupos"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "Renomear"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modificar a conta..."
@@ -3029,51 +3005,51 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Activated"
 msgstr "Activo"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Deactivated"
 msgstr "Inactivo"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Integer"
 msgstr "No grupo"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Nome da opción"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Ningún)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Oculta"
 
@@ -3087,257 +3063,256 @@ msgstr "Recibiu unha entrada nova:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Inglés"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Belarusian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Breton"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "British"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Basque"
 msgstr "Éuscaro"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Francés"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Noruegués b"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Norwegian"
 msgstr "Noruegués"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Portugués do Brasil"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Serbian"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Chinés (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Idioma do corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Non está dispoñíbel ningunha conexión"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "A súa mensaxe non se enviará mentres non estiver conectado."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "nove"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Alcume"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Letra:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Información"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Cifrado activado"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Non está na listaxe"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
@@ -3345,101 +3320,58 @@ msgstr "Usar a autenticación"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Comandos: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uso: /%s, limpa o texto da fiestra."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uso: /%s, oculta os botóns de charla."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Uso: /%s <acción>, envíalle unha acción ao grupo de charla actual. Usa a "
-"terceira persoa. (por exemplo /%s berra.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr ""
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Uso: /%s, oculta os botóns de charla."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Non hai información de axuda para /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3447,22 +3379,22 @@ msgstr ""
 "Se pecha este separador e ten o historial desactivado, esta mensaxe "
 "perderase."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
@@ -3471,23 +3403,23 @@ msgstr "%(nick)s está agora %(status)s"
 msgid "creating logs database"
 msgstr "a crear a base de datos de rexistros"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é un ficheiro mais podería ser un directorio"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim pecharase agora"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é un directorio mais podería ser un ficheiro"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "a crear un directorio %s"
@@ -3559,9 +3491,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 #, fuzzy
 msgid "Groupchats"
 msgstr "Grupos de charla"
@@ -3580,72 +3512,113 @@ msgstr "%d mensaxe sen ler"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e o notificador Daemon para amosar as notificacións"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo en minutos, despois de cambiar a ausente"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ausente por inactividade"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo en minutos, despois de cambiar a non dispoñíbel"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Non dispoñíbel por inactividade"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "O nome de usuario non é válido"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "texto da mensaxe de estado"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "O nome de usuario non é válido"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Cambiando o alcume"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "texto da mensaxe de estado"
+
 # duda sobre collapsed
-#: ../src/common/config.py:99
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Listaxe (separada por espazos) de filas (contas e grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "Por defecto"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Activar a mensaxaría de ligazón local / zeroconf"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Idioma que emprega o corrector"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3655,7 +3628,7 @@ msgstr ""
 "'ás veces' - amosar a hora cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca amosar a hora."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -3666,18 +3639,18 @@ msgstr ""
 "0 para desactivar o fuzzyclock. 1 é o reloxo máis preciso, 4 o menos "
 "preciso. So se emprega se está conectado print_time 'ás veces'"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratar os pares de * / _ como posíbeis caracteres de formato."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se é verdadeiro, non elimina */_ . Daquela, *abc* será negra, mais sen "
 "eliminar * *"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 #, fuzzy
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
@@ -3687,7 +3660,7 @@ msgstr ""
 "Usa a sintaxe de ReStructured para HTML, mais o formato ascii se está "
 "seleccionado (se quere usalo, instale o docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3695,7 +3668,7 @@ msgstr ""
 "Carácter para engadir despois do alcume cando se usa o completado de alcume "
 "(tab) nos grupos de charla."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3703,26 +3676,26 @@ msgstr ""
 "Carácter para propor para engadir logo do alcume desexado cando alguén está "
 "a empregalo no grupo de conversa."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Engadir * e [n] no título da listaxe?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3730,11 +3703,25 @@ msgstr ""
 "Cantas liñas quere lembrar da última charla cando se volve abrir un "
 "separador/fiestra de charla"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Cantos minutos debe durar a última liña da conversa anterior."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3742,11 +3729,11 @@ msgstr ""
 "Envíe un mensaxe con Ctrl+Intro e con Intro faise unha liña nova (como o "
 "cliente de Mirabilis ICQ)"
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cantas liñas desexa almacenar para Ctrl+Arriba."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3755,12 +3742,12 @@ msgstr ""
 "URL personalizada con %s onde %s é a palabra/frase ou 'WIKTIONARY' que "
 "significa usar o wiktionary"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se está marcado, o Gajim pode controlarse remotamente ao usar o gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3772,14 +3759,14 @@ msgstr ""
 "posto en Falso e sincronicen co estado global) baseados no estado daconexión "
 "da rede."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Enviáronse as notificacións de estado. Pode ser all, composing_only o "
 "disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3787,7 +3774,7 @@ msgstr ""
 "As notificacións de estado móstranse nas fiestras de conversa. Poden ser "
 "todo, só_compor ou desactivado."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3795,11 +3782,11 @@ msgstr ""
 "Cando non se amosa a hora en cada mensaxe (print_time==sometimes), móstraa "
 "cada x minutos."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3807,7 +3794,7 @@ msgstr ""
 "Preguntar sempre antes de pechar a fiestra/separador dun grupo de charla "
 "nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3815,13 +3802,13 @@ msgstr ""
 "Non preguntar nunca antes de pechar a fiestra/separador dun grupo de charla "
 "nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3830,29 +3817,29 @@ msgstr ""
 "Elimínase o host que enviamos para a transferencia dun ficheiro caso de "
 "tradución do enderezo ou o redirección de portos."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Segundo o estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Notifica acontecementos na área de notificación."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Quere amosar o separador cando só hai unha conversa?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 "Quere amosar o bordo a pestanexar do caderno de notas nas fiestras charla?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Quere amosar o botón de pechar no tabulador?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3860,18 +3847,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Separarase por ';'unha listaxe de palabras que serán resaltadas nos grupos "
 "de charla."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3880,13 +3867,13 @@ msgstr ""
 "fiestras. Esta preferencia só se activa se se usa a icona da área de "
 "notificación. "
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Se é verdadeiro, o Gajim rexistra xmpp:// en cada inicio."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3894,7 +3881,7 @@ msgstr ""
 "Se for verdadeiro, o Gajim amosará unha icona en cada separador que conteña "
 "mensaxes sen ler. A depender do tema, esta icona pode ser animada."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3902,11 +3889,11 @@ msgstr ""
 "Se é verdadeiro, o Gajim amosará a mensaxe de estado, se non está baleiro, "
 "para cada contacto baixo o seu nome de contacto na fiestra da listaxe."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3915,7 +3902,7 @@ msgstr ""
 "non tivo unha circunstancia a última vez ou se ten gardada unha demasiada "
 "antiga."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3923,7 +3910,7 @@ msgstr ""
 "Se é falso, o Gajim nunca máis amosará a liña de estado cando un contacto "
 "cambie o seu estado ou a súa mensaxe de estado"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 #, fuzzy
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
@@ -3938,30 +3925,30 @@ msgstr ""
 "mensaxes de estado. Se é \"in_and_out\", o Gajim só amosará as entradas e as "
 "saídas no grupo de conversa."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Cor de fondo para os contactos que acaban de se conectar."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Cor de fondo para os contactos que acaban de se desconectar."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se é verdadeiro, as mensaxes restauradas usarán unha fonte máis pequena que "
 "a predefinida."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Non amosar a circunstancia para o transporte en si mesmo"
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Non amosar a listaxe na barra de tarefas."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3970,7 +3957,7 @@ msgstr ""
 "Se é verdadeiro e as versións instaladas de GTK+ e PyGTK son, cando menos, "
 "2.8, resalta a fiestra cando hai eventos pendentes."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3981,7 +3968,7 @@ msgstr ""
 "envío de información SHA no grupo de charla."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4002,33 +3989,33 @@ msgstr ""
 "envíase a unha fiestra específica. Nota: cambie esta opción require "
 "reiniciar o Gajim para que os cambios teñan efecto."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Se é verdadeiro, ao premer a tecla escape pecha unha fiestra/separador."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Oculta o báner nunha fiestra de grupo de charla"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Oculta o báner nunha fiestra de charla de dúas persoas."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Oculta os ocupantes nas fiestras de grupo de charla."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -4036,17 +4023,17 @@ msgstr ""
 "Nunha charla, amosa o alcume ao comezo nunha soa liña cando non é a mesma "
 "persoa a que enviou a última mensaxe."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Sangría cando se use unha combinación de alcumes consecutivos."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Enviar a mensaxe e pechar a fiestra"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4055,13 +4042,13 @@ msgstr ""
 "Listaxe de cores que se empregarán para colorear o alcume nos grupos de "
 "charla."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab conduce ao próximo separador de composición cando ningún está sen "
 "ler."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4069,7 +4056,25 @@ msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Débese amosar a confirmación da creación de metacontactos ou non? Unha "
+"secuencia baleira significa que nunca se amosará."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Débese amosar a confirmación da creación de metacontactos ou non? Unha "
+"secuencia baleira significa que nunca se amosará."
+
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -4080,81 +4085,91 @@ msgstr ""
 "fiestra de modificación de conta. TEÑA COIDADO, cando está conectado cunha "
 "prioridade negativa, NON recibirá ningunha mensaxe do seu servidor."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4162,68 +4177,79 @@ msgstr ""
 "A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
 "están definidas nas opcións de autoprioridade_*"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4231,125 +4257,125 @@ msgstr ""
 "Se isto está marcado, o Gajim usará o seu IP e proxies que se definen na "
 "opción file_transfer_proxies para a súa transferencia."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Está o OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingua en que se comprobarán os erros ortográficos"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "estado separado por espazos ou all"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'si', 'non' ou 'ambos'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'si', 'non' ou ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, déixeme unha mensaxe."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "A traballar"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Fóra"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4358,178 +4384,185 @@ msgstr ""
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "ultramariño"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "mariño"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Host errado"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "A información de rexistro para o transporte %s non chegou a tempo"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Rexistrar %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alcume non permitido: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Non se puido entrar no grupo de charla"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Non existe o grupo de charla."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "A creación de grupos de charla está restrinxida."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "É necesario usar o alcume rexistrado."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non está na listaxe de membros"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "solicitude de eliminación de subscrición de %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "xa non estamos subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4539,287 +4572,273 @@ msgstr ""
 "contactos. Use as ferramentas de xestión de listaxe de contactos roster como "
 "http://jru.jabberstudio.org/ para o eliminar"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Non se facilitou a chave de OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Conectarase a %s sen o OpenPGP"
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "A resposta non é válida"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Comprobe a súa conexión ou probe máis tarde."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Comprobe a súa conexión ou probe máis tarde"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Fallou a autenticación con \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprobe que o seu nome de usuario e o seu contrasinal sexan os "
 "correctos."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensaxe está *cifrada* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4828,30 +4847,40 @@ msgstr ""
 "Asunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contactos"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Non se conseguiu debido ao estado invisíbel"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Fallou a conexión"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Observadores"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transportes"
 
@@ -4861,14 +4890,19 @@ msgid "Not in roster"
 msgstr "Non está na listaxe"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "As ligazóns D-Bus de python non se achan neste computador"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Non se poden empregar as capacidades D-Bus de Gajim"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "falta a dependencia pysqlite2 (tcc python-pysqlite2). A saír..."
@@ -4945,56 +4979,69 @@ msgid "eleven"
 msgstr "once"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s en punto"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s e cinco"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s e dez"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s e cuarto"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s e vinte"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s e vinte e cinco"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s e media"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "%(1)s menos vinte e cinco"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "%(1)s menos vinte"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "%(1)s menos cuarto"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "%(1)s menos dez"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "%(1)s menos cinco"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s en punto"
 
@@ -5062,224 +5109,224 @@ msgstr "Carácter non válido no nome do host."
 msgid "Invalid character in resource."
 msgstr "Carácter non válido no recurso."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Libre para falar"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "En liñ_a"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "En líña"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Invisíbel"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "Ten erros"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "está a escribir..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar a mensaxe"
 msgstr[1] "Enviar a mensaxe"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5295,11 +5342,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "erro: non se pode abrir %s para lectura"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "ciano"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrando os rexistros da base de datos aos índices"
@@ -6017,13 +6064,13 @@ msgstr ""
 "cancelarase."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -6032,15 +6079,27 @@ msgstr ""
 "O host que configurou como a opción avanzada ft_override_host_to_send non é "
 "valido e ignorarase."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Non se facilitou a chave de OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Conectarase a %s sen o OpenPGP"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Para continuar a enviar e recibir mensaxes, precisa volver conectarse."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Erro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -6049,32 +6108,32 @@ msgstr ""
 "%s\n"
 "A mensaxaría de ligazón local podería non funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor, comprobe se o Avahi está instalado."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Non foi posíbel ligar ao porto %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Non foi posíbel cambiar o estado da conta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -6083,21 +6142,21 @@ msgstr ""
 "enviar "
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6110,26 +6169,26 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensaxes de estado por defecto"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Non está dispoñíbel o dicionario para o idioma %s"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6138,72 +6197,72 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "título da mensaxe de estado"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "texto da mensaxe de estado"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Quere reconectarse agora?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se quere que se apliquen todos os cambios instantaneamente, debe "
 "reconectarse."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP non se pode usar neste ordenador"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Acontecementos sen ler"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Lea todos os eventos pendentes antes de eliminar esta conta."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Comezou unha charla coa conta %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Está actualmente conectado ao servidor"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Para cambiar o nome da conta, debe ler o resto de\n"
 "acontecementos pendentes"
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "O nome da conta xa está en uso"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6211,142 +6270,148 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "O nome da conta non é válido"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "O nome da conta non pode estar baleiro."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "O nome da conta non pode conter espazos."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "Xestionar as contas"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Unha ID de Jabber debe estar na forma \"usuario@nomeservidor\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Produciuse un erro ao obter as chaves secretas"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Houbo un problema ao recuperar as súas chaves secretas de OpenPGP"
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Selección da chave de OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Elixa a súa chave de OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Non está dispoñíbel esta conta"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Debe crear unha conta antes de editar a súa información persoal"
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sen unha conexión, non pode editar a súa información persoal"
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "O seu servidor non admite o vCard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "O seu servidor non pode gardar a súa información persoal."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Para cambiar o nome da conta, debe estar desconectado"
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "A conta local xa existe."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor, volva darlle nome ou elimíneo antes de habilitar a mensaxaría de "
 "ligazón local."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Rexistrar %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Listaxe de expulsión"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Listaxe de membros"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Listaxe de propietarios"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Listaxe de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Posto"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "A expulsar..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6354,11 +6419,11 @@ msgstr ""
 "<b>A quen quere expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "A engadir o membro..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6366,11 +6431,11 @@ msgstr ""
 "<b>A quen quere facer membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "A engadir un propietario..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6379,11 +6444,11 @@ msgstr ""
 "<b>A quen quere facer como propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "A engadir administrador..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6391,7 +6456,7 @@ msgstr ""
 "<b>A quen quere facer como administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6408,59 +6473,59 @@ msgstr ""
 "usuario@dominio, dominio/recurso ou enderezo que contén\n"
 "un subdominio."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "A eliminar a conta %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Se a elimina, perderase a conexión co servidor"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Entrar e saír soamente"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Todos"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Este marcador ten información que non é válida"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6468,70 +6533,68 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcume non permitido: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "A conta engadiuse con éxito"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Pode configurar opcións avanzadas da conta se preme o botón Avanzado, ou "
 "máis tarde mediante o submenú Contas do menú Editar da fiestra principal."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Debe pórlle un nome para configurar esta conta."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Especifique o novo alcume que quere usar:"
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6541,7 +6604,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6549,73 +6612,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Produciuse un erro durante a creación da conta"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "O nome da conta está en uso"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Xa ten unha conta en que emprega este nome"
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Acontecemento"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Recibiuse a primeira mensaxe"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Nome de contacto"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Enviouse a mensaxe"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Recibiuse unha mensaxe de grupo de charla"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Recibiuse un correo de GMail"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6624,75 +6687,75 @@ msgstr ""
 "O texto que está debaixo desta liña foi o que se dixo desde a última vez que "
 "lle prestou atención a esta sala de charla"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Saír"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Accións para \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Buscalo no _Dicionario"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" no URL do dicionario e non está no WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" no URL da busca web"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Buscalo na rede"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "_Abrir como ligazón"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Onte"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "hai %i días"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de MI de Jabber"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6728,21 +6791,21 @@ msgstr "Nome de contacto"
 msgid "Set Mood"
 msgstr "Definir a MDD"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaxe de estado %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6750,107 +6813,107 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Gardar como mensaxe de estado predefinido"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Escriba un nome para esta mensaxe de estado"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "Enderezo de AIM:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "Enderezo de MSN:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Enderezo de Yahoo!:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduza a información do contacto que quere engadir á conta %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, cubra a información do contacto que quere engadir"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "A ID de usuario non é válida"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario non contén un recurso."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Xa engadiu este contacto á súa listaxe."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Desenvolvedores actuais:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Desenvolvedores anteriores:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "AGRADECEMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Por último mais non menos importante, queremos agradecerlles a todos os "
 "mantedores de paquetes."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6861,95 +6924,105 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Solicitude de subscrición para a conta %s de %s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitude de subscrición de %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Xa está na sala %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar nun grupo de charla coa conta %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "O nome da conta non é válido"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Debe crear unha conta antes de poder conversar con outros contactos."
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Isto non é un grupo de charla"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non é o nome dun grupo de charla."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar a charla coa conta %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Iniciar a charla"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6958,302 +7031,302 @@ msgstr ""
 "enviar unha mensaxe de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Non se pode analizar \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "O contrasinal non é válido"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Debe introducir un contrasinal."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Mensaxe nova"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Mensaxe nova"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Mensaxe privada nova"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Correo electrónico novo"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Convite a grupo de charla"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensaxe nova coa conta %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Entrou unha mensaxe nova na conta %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Mensaxe:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Recibida %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Estou %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Enderezo"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Listaxe de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Listaxe de privacidade para %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Orde: %s, acción: %s, tipo: %s, valor: %s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orde: %s, acción: %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listaxes de privacidade para %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "O nome de listaxe non é válido"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Debe introducir un nome para crear unha listaxe de privacidade."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Elixir un son"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Elixir unha imaxe"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cando %s estea:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "núm."
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "cando estea "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7261,38 +7334,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7302,26 +7375,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7416,20 +7489,20 @@ msgstr "Descrición"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "O marcador xa se definiu"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" xa está nos seus marcadores."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "O marcador engadiuse con éxito"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Pode xestionar os seus marcadores mediante o menú Accións da súa listaxe"
@@ -7443,15 +7516,15 @@ msgstr "Engadiuse"
 msgid "Node"
 msgstr "Ningún"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Publicación nova"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Engadir"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
@@ -7894,31 +7967,31 @@ msgstr "O Gajim precisa o Xserver para funcionar. A abortar..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior para funcionar. A abortar..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "O Gajim precisa un GTK 2.6 ou superior"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "O Gajim precisa un GTK 2.6 ou superior para funcionar. A abortar..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "A biblioteca GTK+ precisa un soporte de libglade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7927,22 +8000,22 @@ msgstr ""
 "Por favor, elimine a súa biblioteca GTK+ actual e instale a última versión "
 "estábel desde %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Por favor, asegúrese de que GTK+ e PyGTK teñen un soporte libglade no seu "
 "sistema."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "O Gajim precisa un PySQLite2 para funcionar"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa un pywin32 para funcionar"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7952,11 +8025,11 @@ msgstr ""
 "obtelo en %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "O Gajim xa está a se executar"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7964,34 +8037,34 @@ msgstr ""
 "Outra instancia dO Gajim semella estar xa en execución\n"
 "Quere executar unha outra?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza o contrasinal GPG para a conta %s"
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Conectarase a %s sen o OpenPGP"
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8002,183 +8075,189 @@ msgstr ""
 "ocupante. \n"
 "Por favor, especifique outro alcume abaixo:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "produciuse un erro mentres se enviaba %s ( %s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contacto \"%s\" autorizouno para ver o seu estado."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Eliminar"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s coñéceselle como %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "É necesario un contrasinal para entrar a este grupo de charla."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está actualmente conectado sen a súa chave de GPG"
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "O contrasinal é incorrecto"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Non me preguntar outra vez"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Hai un correo novo en %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Ten %d nova conversa de correo"
 msgstr[1] "Ten %d novas conversas de correo"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8188,92 +8267,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro ao ler o ficheiro:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recibiu con éxito o ficheiro %(ficheiro)s de %(nome)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Detívose a transferencia do ficheiro %(ficheiro)s de %(nome)s."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Envioulle con éxito o ficheiro %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En cada _mensaxe"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escriba un nome de usuario novo para a súa conta local"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8281,15 +8360,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8300,63 +8379,63 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Conexión"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
@@ -8392,12 +8471,13 @@ msgstr ""
 "nunha liña distinta"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "conta"
 
@@ -8424,9 +8504,9 @@ msgstr ""
 "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
 "ocupado, invisíbel"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "mensaxe"
 
@@ -8444,22 +8524,47 @@ msgstr ""
 "activada"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Cambia o estado dunha ou de varias contas"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Pr_ioridade:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Quero _rexistrar unha conta nova de Jabber"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"cambia o estado da conta \"account\". Se non se especifica, probe a cambiar "
+"o estado de todas as contas que teñen a opción \"sync with global status\" "
+"activada"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Amosa o diálogo de charla para enviarlle mensaxes a un contacto"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto co que quere conversar"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se se especifica, o contacto obtense da listaxe desta conta"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8469,29 +8574,29 @@ msgstr ""
 "OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "contido da mensaxe"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se se especifica, a mensaxe cifrarase mediante a súa chave pública"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "se se especifica, a mensaxe enviarase a través desta conta"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8501,140 +8606,140 @@ msgstr ""
 "OpenPGP como a conta son optativas. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema da mensaxe"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Obter información detallada dun contacto"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Obter información detallada dunha conta"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "ficheiro"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Camiño do ficheiro"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "se se especifica, o ficheiro enviarase mediante esta conta"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Nomea todas as preferencias e os seus valores"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "a 'entrada' é o nome da preferencia, o 'valor' é o do valor para definir"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nome da preferencia para eliminar"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe o estado actual da preferencias do Gajim para o ficheiro de "
 "configuración"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Engade o contacto á listaxe"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Engade un contacto novo a esta conta."
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devolve o estado actual (o global se non se especificar unha conta)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devolve a mensaxe de estado actual (o global se non se especificar unha "
 "conta)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Devolve o número de mensaxes sen ler"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abre o diálogo de iniciar charla"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Iniciar unha charla con esta conta"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML para enviar"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8642,80 +8747,80 @@ msgstr ""
 "Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
 "a todas as contas"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "contido da mensaxe"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Sala:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "nick"
 msgstr "Alcume"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Non se achou o alcume: %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "password"
 msgstr "Contrasinal: "
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8724,31 +8829,31 @@ msgstr ""
 "'%s' non está na súa listaxe de contactos.\n"
 "Por favor, especifique unha conta para enviar a mensaxe."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Non ten contas activas"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "Non se encontrou %s"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8757,7 +8862,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando é un de:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8766,7 +8871,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8775,7 +8880,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Host errado"
@@ -8806,311 +8911,175 @@ msgstr "Non pode eliminar o tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primeiro elixa outro distinto como tema actual."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Quer xa non está no grupo de charla \"%s\" quer \"%s\" esta xa non existe."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historial de conversas"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Conexión"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afiliación:"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s saíu"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Non se achou o alcume: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Este grupo de charla non ten un asunto"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s convidouse a %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Non se achou o alcume: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Uso: /%s <alcume|JID> [motivo], expulsa o JID do grupo de charla. O alcume "
-"dun ocupante pode ser substituído, mais non se contén \"@\". Se o JID está "
-"actualmente no grupo de charla, el/ela será tamén expulsado. NON se admiten "
-"espazos no alcume."
-
-#: ../src/groupchat_control.py:1734
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Uso: /%s [motivo], pecha a fiestra ou o separador actual e amosa o motivo se "
-"se especificar."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Uso: /%s <JID> [reason], convida o JID ao grupo de charla actual, e "
-"opcionalmente especifica un motivo."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Uso: /%s <sala>@<servidor>[/alcume], ofrece a entrada a sala@servidor e usa "
-"opcionalmente o alcume especificado"
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Uso: /%s <alcume> [motivo], elimina da sala o ocupante que especificao "
-"alcume e opcionalmente especifica un motivo. NON se admiten espazos no "
-"alcume."
-
-#: ../src/groupchat_control.py:1762
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Uso: /%s <alcume> [message], abre unha fiestra de charla privada e envíalle "
-"unha mensaxe ao ocupante que especifica o alcume."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Uso: /%s <alcume>, cambia o seu alcume na sala actual."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Uso: /%s , amosa os nomes dos ocupantes do grupo de charla."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Uso: /%s [tema], amosa ou actualiza o asunto actual da sala."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Uso: /%s <mensaxe>, envía unha mensaxe sen buscar outros comandos."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Uso: /%s <alcume>, cambia o seu alcume na sala actual."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se pecha esta fiestra, desconectaráselle deste grupo de charla."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Cambiando o asunto"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Especifique o asunto novo:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Cambiando o alcume"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifique o novo alcume que quere usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrición: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
@@ -9184,6 +9153,15 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Gardar a imaxe como..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Novo grupo de charla"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Gustaríame engadilo á miña listaxe de contactos"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Non se pode achar a base de datos do historial"
@@ -9268,53 +9246,62 @@ msgstr "Historial de conversas con %s"
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Mensaxe de erro: %s"
+
+#: ../src/history_window.py:440
+msgid "Error"
+msgstr ""
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "O estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Mensaxes"
 
@@ -9375,12 +9362,12 @@ msgstr "nove"
 msgid "Retrieving profile..."
 msgstr "A recuperar o perfil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "Camiño do ficheiro"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "Non existe o grupo de charla."
@@ -9388,7 +9375,7 @@ msgstr "Non existe o grupo de charla."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
@@ -9420,46 +9407,46 @@ msgstr ""
 "Produciuse un erro mentres se publicaba a súa información persoal, probe de "
 "novo máis tarde."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Enviouse a autorización"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" acepta esta solicitude, poderá saber o seu estado."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar nun ou máis grupos de charlas"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9467,28 +9454,28 @@ msgstr ""
 "Ao cambiar o seu estado a invisíbel provocará a súa desconexión dos grupos "
 "de charla. Está seguro de que quere ser invisíbel?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9497,16 +9484,16 @@ msgstr ""
 "As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
 "historial activado"
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9514,11 +9501,11 @@ msgid ""
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9527,58 +9514,69 @@ msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde estes transportes: "
 "%s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Quere eliminar o grupo %s da listaxe?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Eliminar da listaxe tamén todos os contactos dentro do grupo"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Asignar chave de OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Seleccione unha chave para lle aplicar ao contacto"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9587,12 +9585,12 @@ msgstr ""
 "ela sempre o/a verá desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9600,16 +9598,16 @@ msgstr ""
 "Ao eliminar este contacto tamén se eliminará a autorización. Este contacto "
 "sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto coñeza o meu estado despois da eliminación"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Os contactos eliminaranse da súa listaxe"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9619,19 +9617,32 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debe crear unha conta antes de poder conversar con outros contactos."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9640,12 +9651,12 @@ msgstr ""
 "O seu servidor non admite almacenar información de metacontactos. Por tanto, "
 "toda a información referente non se gardará na próxima reconexión."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9656,24 +9667,24 @@ msgstr ""
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s quere enviarlle un ficheiro:"
 msgstr[1] "%s quere enviarlle un ficheiro:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Facer %s e %s metacontactos"
@@ -9683,123 +9694,134 @@ msgstr "Facer %s e %s metacontactos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "a usar a conta %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "á conta %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "a usar a conta %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Xestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "para a conta %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descubrir os servizos..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Gustaríame engadilo á miña listaxe de contactos"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Editar os grupos"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Enviar mensaxe"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Executar o comando..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Amosar os trans_portes"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "Renomear"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "Contacto desconectado"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "Novo grupo de charla"
+msgid "_Disconnect"
+msgstr "Contacto desconectado"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Historial"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Entrar nun outro grupo de charla"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Cambiar a mensaxe de estado..."
 
@@ -9816,20 +9838,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9839,7 +9861,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10036,6 +10058,128 @@ msgstr ""
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Engadir unha _notificación especial"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Asignar chave de OpenPGP"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Comandos: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Uso: /%s, limpa o texto da fiestra."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Uso: /%s, oculta os botóns de charla."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Uso: /%s <acción>, envíalle unha acción ao grupo de charla actual. Usa a "
+#~ "terceira persoa. (por exemplo /%s berra.)"
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Uso: /%s, oculta os botóns de charla."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Non hai información de axuda para /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Activar a mensaxaría de ligazón local / zeroconf"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Non se achou o alcume: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Este grupo de charla non ten un asunto"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s convidouse a %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Non se achou o alcume: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Uso: /%s <alcume|JID> [motivo], expulsa o JID do grupo de charla. O "
+#~ "alcume dun ocupante pode ser substituído, mais non se contén \"@\". Se o "
+#~ "JID está actualmente no grupo de charla, el/ela será tamén expulsado. NON "
+#~ "se admiten espazos no alcume."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Uso: /%s [motivo], pecha a fiestra ou o separador actual e amosa o motivo "
+#~ "se se especificar."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Uso: /%s <JID> [reason], convida o JID ao grupo de charla actual, e "
+#~ "opcionalmente especifica un motivo."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Uso: /%s <sala>@<servidor>[/alcume], ofrece a entrada a sala@servidor e "
+#~ "usa opcionalmente o alcume especificado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Uso: /%s <alcume> [motivo], elimina da sala o ocupante que especificao "
+#~ "alcume e opcionalmente especifica un motivo. NON se admiten espazos no "
+#~ "alcume."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Uso: /%s <alcume> [message], abre unha fiestra de charla privada e "
+#~ "envíalle unha mensaxe ao ocupante que especifica o alcume."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Uso: /%s <alcume>, cambia o seu alcume na sala actual."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Uso: /%s , amosa os nomes dos ocupantes do grupo de charla."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr "Uso: /%s [tema], amosa ou actualiza o asunto actual da sala."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr "Uso: /%s <mensaxe>, envía unha mensaxe sen buscar outros comandos."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Uso: /%s <alcume>, cambia o seu alcume na sala actual."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Prema para ver as características (como transportes de MSN e ICQ) dos "
diff --git a/po/hr.po b/po/hr.po
index 6abd3e4aa..09fb4347a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:52+0200\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -216,6 +216,7 @@ msgstr "<b>Osobne informacije</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Korisnički račun"
 
@@ -282,8 +283,8 @@ msgstr "Izmjeni Osobne Informacije"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -294,8 +295,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Općenito"
 
@@ -354,25 +355,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacije o vama, kako stoji na poslužitelju"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Niti jedan ključ nije odabran"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ništa"
 
@@ -528,8 +525,8 @@ msgstr ""
 "Mogli bi ste uzeti u obzir mogućnost izmjene postavki vatrozida."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -543,7 +540,7 @@ msgid "Mer_ge accounts"
 msgstr "_Spoji račune"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Pre_imenuj"
 
@@ -805,7 +802,7 @@ msgid "All statuses"
 msgstr "Svi statusi"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Odsutan"
 
@@ -822,7 +819,7 @@ msgid "Have "
 msgstr "Imam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -831,7 +828,7 @@ msgid "Launch a command"
 msgstr "Pokrenite naredbu"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Nedostupan"
 
@@ -1017,7 +1014,7 @@ msgid "Join _Group Chat"
 msgstr "_Grupni Razgovori"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Dodaj na Listu..."
 
@@ -1043,39 +1040,6 @@ msgstr "_Otvori Link u Pregledniku"
 msgid "_Start Chat"
 msgstr "_Započni Razgovor"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Pozovi _Kontakte"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Pošalji _Datoteku"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Uključi/Isključi End to End Enkripciju"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Uključi/Isključi Open_PGP Enkripciju"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Dodaj na Listu"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Povijest razgovora"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "Po_zovi"
@@ -1100,6 +1064,119 @@ msgstr ""
 "Započeti će te MUC razgovor.\n"
 "Odaberite kontakte koje želite pozvati"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Traži njegov/njezin status"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Dodaj Posebnu _Obavijest..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Pridruži Open_PGP Ključ..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Izvrši Naredbu..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Uredi _Grupe..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "Pozo_vi u"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Pozovi _Kontakte"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "Uklo_ni"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Postavi Prila_gođeni Status"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Pošalji Jednu _Poruku..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Pošalji _Datoteku..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Postavi Prilagođeni _Avatar..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Započni _Razgovor"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Uključi/Isključi End to End Enkripciju"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Uključi/Isključi Open_PGP Enkripciju"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Dozvoli njemu/njoj da vidi moj status"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Blokiraj"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Zabrani mu/joj da vidi moj status"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Povijest razgovora"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignoriraj"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Uredi Kontakt"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Preimenuj..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Pretplata"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Odblokiraj"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Prestani Ignorirati"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Ispunite formular."
@@ -1217,7 +1294,7 @@ msgstr ""
 "Red Kontakt\n"
 "Baner Razgovora"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Podebljano"
 
@@ -1241,7 +1318,7 @@ msgstr "Otišao"
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Ukošeno"
 
@@ -1313,6 +1390,14 @@ msgstr "Mo_derator"
 msgid "Occupant Actions"
 msgstr "Akcije Prisutnih"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Pošalji _Datoteku"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Dodaj na Listu"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1321,13 +1406,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Zabrani"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Blokiraj"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Izbaci"
@@ -1344,13 +1422,6 @@ msgstr "_Vlasnik"
 msgid "_Send Private Message"
 msgstr "_Pošalji Privatnu Poruku"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Odblokiraj"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Glas"
@@ -1359,7 +1430,7 @@ msgstr "_Glas"
 msgid "Create new post"
 msgstr "Stvorite novi dopis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Od"
 
@@ -1384,8 +1455,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Dobrodošli u Gajim Upravitelj Zapisima</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Obriši"
 
@@ -1439,34 +1510,39 @@ msgstr "Pretraga:"
 msgid "_Log conversation history"
 msgstr "_Pamti povijest razgovora"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Postavi knjižnu oznaku za sobu (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Pridruži se ovoj sobi automatski kada se povežem"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Nadimak:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Nedavno:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Pridruživanje"
@@ -1496,7 +1572,7 @@ msgstr "Minimiziraj kod Automatskog Ulaska"
 msgid "Print status:"
 msgstr "Ispis statusa:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Poslužitelj:"
 
@@ -2031,7 +2107,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sortiranje kontakata po statusu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2198,34 +2274,39 @@ msgid "All"
 msgstr "Svi"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "sve prema pretplati"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Dozvoli"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Odbij"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Lista Privatnosti"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "sve prema pretplati"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "sve u grupi"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2237,19 +2318,19 @@ msgstr ""
 "od\n"
 "za"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "da mi šalje poruke"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "da mi šalje upite"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "da mi prikaže status"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "da vidi moj status"
 
@@ -2417,96 +2498,11 @@ msgstr "Ukloni račun iz Gajima i sa po_služitelja"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Traži njegov/njezin status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Dodaj Posebnu _Obavijest..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Pridruži Open_PGP Ključ..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Uredi _Grupe..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Izvrši Naredbu..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "Pozo_vi u"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "Uklo_ni"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Postavi Prila_gođeni Status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Pošalji Jednu _Poruku..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Pošalji _Datoteku..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Postavi Prilagođeni _Avatar..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Započni _Razgovor"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Dozvoli njemu/njoj da vidi moj status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Zabrani mu/joj da vidi moj status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignoriraj"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Uredi Kontakt"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Preimenuj..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Pretplata"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Prestani Ignorirati"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2628,7 +2624,7 @@ msgid "_Add contact"
 msgstr "_Dodaj kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Informacije"
 
@@ -2841,26 +2837,6 @@ msgstr "_Poruka"
 msgid "_Presence"
 msgstr "_Prisutnost"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Dodaj Posebnu _Obavijest"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Pridruži Open_PGP Ključ"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Izmjeni _Grupe"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Preimenuj"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Izmjeni Račun..."
@@ -2904,48 +2880,48 @@ msgid "Service returned an error."
 msgstr "Servis je odgovorio sa greškom."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Aktivno"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Neaktivno"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Cijeli broj"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Boja"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Ime Postavke"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Vrijednost"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Vrsta"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Nema)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Skrivena"
 
@@ -2959,188 +2935,187 @@ msgstr "Primili ste novi unos:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Engleski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Bjeloruski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretonski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Češki"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Njemački"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Britanski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Španjolski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Baskijski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Francuski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Talijanski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norveški (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Nizozemski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brazilski Portugalski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Srpski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovački"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Švedski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Jezik pravopisa"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Vaša poruka ne može biti poslana dok niste spojeni."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Neodređen"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Bolestan"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Font:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informacije Kontakta"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Zaista pošalji datoteku?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Ako pošaljete datoteku osobi %s, on/ona će znati vaš pravi Jabber ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Nije na Listi Kontakata"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Lista aktivnih, kompletiranih i zaustavljenih prijenosa datoteka"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Nepoznat Izvođač"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Nepoznat Naslov"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Nepoznat Izvor"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3149,17 +3124,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "šalje <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s iz grupnog razgovora %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "GPG ključ nije dodjeljen"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3167,50 +3142,50 @@ msgstr ""
 "Niti jedan GPG ključ nije dodjeljen ovom kontaktu. Nije moguće kriptirati "
 "poruke sa GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti sačuvana"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti sačuvana"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "i autentičan"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "i NIJE autentičan"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3219,91 +3194,48 @@ msgstr ""
 "%(type)s enkripcija %(status)s aktivna %(authenticated)s.\n"
 "Vaš razgovor %(logged)s biti zapisan."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Naredba nije podržana za zeroconf račun."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Komanda: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uporaba: /%s, prazni tekstualni prozor"
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uporaba: /%s, sakriva dugmadi."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Uporaba: /%(command)s <action>, šalje akciju trenutnom grupnom razgovoru. "
-"Koristi treću osobu. (npr. /%(command)s eksplodira.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Uporaba: /%s, šalje ping kontaktu"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Uporaba: /%s, šalje poruku kontaktu"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Nema informacija ni pomoći za /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Pregovaranje o sesiji neuspješno"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Ova razgovor je kriptiran"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr "i biti ĆE sačuvana"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti sačuvana"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Identitet druge strane nije potvrđen. Kliknite na ikonu štita za detalje."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Ova poruka NIJE kriptirana"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Ova poruka je kriptirana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3311,15 +3243,15 @@ msgstr ""
 "Ako zatvorite ovu karticu, a imate povijest onemogućenu, ova poruka biti će "
 "izgubljena."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Pogreška Baze Podataka"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3328,7 +3260,7 @@ msgstr ""
 "Datoteku baze podataka (%s) nije moguće pročitati. Pokušajte je popraviti "
 "ili obrisati (svi zapisi razgovora će biti izgubljeni)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je trenutno %(status)s"
@@ -3337,23 +3269,23 @@ msgstr "%(name)s je trenutno %(status)s"
 msgid "creating logs database"
 msgstr "kreiram bazu zabilješki"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je datoteka ali bi trebao biti direktorij"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim će se sad isključiti"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je direktorij ali bi trebao biti datoteka"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram %s direktorij"
@@ -3417,9 +3349,9 @@ msgstr "Izaberite grupne razgovore koje želite napustiti"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Grupni Razgovori"
 
@@ -3435,73 +3367,114 @@ msgstr "Proslijedi nepročitane poruke"
 msgid "All unread messages have been forwarded."
 msgstr "Sve nepročitane poruke su proslijeđene."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Koristi DBus i Notification-Daemon za prikazivanje obavijesti"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Vrijeme u minutama, nako kojega će se vaš status promijeniti u odsutan."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Odsutan kao rezultat mirovanja dužeg od $T min)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S će biti zamjenjen sa trenutnom statusnom porukom, $T vremena automatske "
 "odsutnosti."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Vrijeme u minutama, nakon kojega će se vaš status promijenti u nije dostupan."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nije dostupan, kao posljedica mirovanja dužeg od $T min)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S će biti zamjenjen sa trenutnom statusnom porukom, $T vremena automatske "
 "produžene nedostupnosti."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Neispravan nadimak"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "tekst statusne poruke"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Neispravan nadimak"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Mijenjam Nadimak"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "tekst statusne poruke"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "predefinirano"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Omogući lokalnu vezu/zeroconf poruke"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3511,7 +3484,7 @@ msgstr ""
 "'sometimes' - ispisuj vrijeme svakih print_ichat_every_foo_minutes minuta.\n"
 "'never' - nikada ne ispisuj vrijeme."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3522,18 +3495,18 @@ msgstr ""
 "najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje _vremena na "
 "'ponekad'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Koristi * / _ parove kao znakove za formatiranje."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ako je Aktivno, nemoj odstraniti */_ . Tako će *abc* biti podebljano, ali "
 "omeđeno sa * *."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3543,7 +3516,7 @@ msgstr ""
 "odabrano. Za sintaksu, pogledajte http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html (Ako ovo želite koristiti, instalirajte docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3551,7 +3524,7 @@ msgstr ""
 "Znak za dodavanje nakon nadimka pri korištenju završavanja nadimka (tipka "
 "tab) u grupnom razgovoru"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3559,7 +3532,7 @@ msgstr ""
 "Znak koji treba pokušati dodati željenom nadimku ukoliko netko u grupnom "
 "razgovoru već koristi željeni nadimak"
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3570,19 +3543,19 @@ msgstr ""
 "Pogledati python dokumentaciju za strftime za kompletan opis: http://docs."
 "python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znakovi koji se ispisuju ispred nadimka u razgovorima"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znakovi koji se ispisuju nakon nadimka u razgovorima"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Dodaj * i [n] u naslov liste?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3590,11 +3563,25 @@ msgstr ""
 "Koliko će se linija pamtiti iz prošlih razgovora kada se prozor/kartica "
 "razgovora ponovno otvori."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Koliko minuta trebaju trajati linije iz prošlog razgovora."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3602,11 +3589,11 @@ msgstr ""
 "Pošalji poruku sa Ctrl+Enter i sa Enter napravi novu liniju. "
 "(Pretpostavljeno ponašanje Mirabilis ICQ klijenta)"
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koliko linija se sprema za Ctrl+TipkaGORE"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3615,11 +3602,11 @@ msgstr ""
 "Ili je osobni url koji sadrži %s, gdje je %s riječ ili fraza ili "
 "'WIKTIONARY' - što znači da koristi wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ako je označeno, Gajim se može kontrolirati preko gajim-remote-a."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3630,14 +3617,14 @@ msgstr ""
 "računa (ako nemaju listen_to_network_manager postavljen na Neaktivno i "
 "sinkroniziraju se sa globalnim statusom) ovisno o statusu mrežnog spoja."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
 "samo_sastavljanje, onemogućeno."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3645,7 +3632,7 @@ msgstr ""
 "Prikazane obavijesti o statusu u prozoru razgovora. Može biti jedno od svi, "
 "samo_sastavljanje, onemogućeno."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3653,11 +3640,11 @@ msgstr ""
 "Ako se ne ispisuje vrijeme za svaku poruku (print_time==ponekad), ispisati "
 "ga svakih x minuta"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj prije zatvaranja kartice/prozora razgovora grupe."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3665,7 +3652,7 @@ msgstr ""
 "Uvijek pitaj prije zatvaranja kartice/prozora grupnog razgovora u ovoj "
 "razmakom odjeljenoj listi jid-ova grupnog razgovora."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3673,13 +3660,13 @@ msgstr ""
 "Nikad ne pitaj prije zatvaranja kartice/prozora grupnog razgovora u ovoj "
 "razmacima podjeljenoj listi jid-ova grupnog razgovora."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3687,27 +3674,27 @@ msgstr ""
 "Lista računala odvojenih zarezom koje šaljemo, kao dodatak lokalnim "
 "sučeljima, za prijenos datoteka u slučaju prosljeđivanja."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard definira KiB = 1024 bajtova, KB = 1000 bajtova"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Obavijesti o svim događajima u traci radne površine."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži karticu ako je otvoren samo jedan razgovor?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaži granicu notesa sa karticama u prozorima razgovora?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Prikaži gumb za zatvaranje u kartici?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3719,18 +3706,18 @@ msgstr ""
 "Veći brojevi su sigurniji, ali im treba duže vremena za izračunavanje kod "
 "pokretanja sesije."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Pregled novih poruka kao obavijest u iskočnom prozoru?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista riječi odijeljena točka-zarezom koje će biti označene u grupnim "
 "razgovorima."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3738,14 +3725,14 @@ msgstr ""
 "Ako je Aktivno, Gajim se završava kad je pritisnut X gumb. Ova postavka je "
 "upotrebljena samo ako je \"trayicon\" u upotrebi."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ako je Aktivno, Gajim će provjeriti da li je zadani jabber klijent pri "
 "svakom pokretanju."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3753,7 +3740,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazvati ikonu na svakoj kartici koja sadrži "
 "nepročitane poruke. Ovisno o temi, ikona može biti i animirana."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3761,11 +3748,11 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazivati statusnu poruku, ako nije prazna, za "
 "svaki kontakt pod imenom kontakta na listi."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Definiraj poziciju avatara na listi. Mogu biti lijevo ili desno"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3773,7 +3760,7 @@ msgstr ""
 "Ako je Aktivno, će Gajim poslati upit za avatar svaki kontakt, koji nije "
 "imao avatar ili je onaj u memoriji prestar"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3781,7 +3768,7 @@ msgstr ""
 "Ako je Neaktivno, više nećete vidjeti statusnu poruku u razgovorima, kada "
 "kontakt promjeni svoj status i/ili statusnu poruku."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3795,29 +3782,29 @@ msgstr ""
 "prikazivati sve statusne poruke. Ako je \"in_and_out\" Gajim će prikazivati "
 "samo poruke tipa FOO je ušao/izašao u/iz sobe."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Boja pozadine kontakata u trenu prijave."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Boja pozadine kontakata u trenu odjave."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ako je Aktivno, vraćene poruke će koristiti manji font od predefiniranog."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u programskoj traci."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3827,7 +3814,7 @@ msgstr ""
 "će bljeskati (pretpostavljeno ponašanje u većini Window Manager-a) kod novih "
 "događaja."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3838,7 +3825,7 @@ msgstr ""
 "u grupnim razgovorima."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3858,31 +3845,31 @@ msgstr ""
 "'pertype' - Svaki tip poruke (npr., razgovori i grupni razgovori) se šalje u "
 "vezani prozor."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ako je Neaktivno, nećete više vidjeti avatar u prozoru razgovora."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ako je Aktivno, pritisak na 'esc' tipku zatvara karticu/prozor."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Skriva dugmad u prozorima razgovora."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Skriva baner u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Skriva baner u prozoru razgovora dviju osoba"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skriva listu učesnika u prozoru grupnog razgovora."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3890,15 +3877,15 @@ msgstr ""
 "U razgovoru, prikaži nadimak na početku reda samo kada se ne radi o istoj "
 "osobi koja je pričala i u prošloj poruci."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentacija kod korištenja nadimaka koji se uzastopno pojavljuju."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Glatko pomicanje kroz poruke u prozorima razgovora."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3906,11 +3893,11 @@ msgstr ""
 "Lista boja, odvojenih sa \":\", koje će biti korištene za bojanje nadimaka u "
 "grupnim razgovorima."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab idi na sljedeću karticu kada nema nepročitanih."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3918,7 +3905,25 @@ msgstr ""
 "Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
 "niz znači da nikada ne prikazujemo upit."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
+"niz znači da nikada ne prikazujemo upit."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
+"niz znači da nikada ne prikazujemo upit."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3929,7 +3934,7 @@ msgstr ""
 "prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke sa vašeg "
 "poslužitelja."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3937,7 +3942,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
 "pohranio lozinke računa."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3946,7 +3951,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
 "pohranio lozinke računa."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3954,7 +3959,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazivati broj prisutnih i ukupnih kontakata u "
 "redovima za račune i grupe."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3962,7 +3967,7 @@ msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretiraj sve dolazne "
 "poruke kao da su izabrane vrste"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3970,7 +3975,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će otklizati i izabrati izabrati kontakt koji vam je "
 "poslao posljednju poruku, ako prozor s razgovorom već nije otvoren."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3978,12 +3983,12 @@ msgstr ""
 "Ako je Aktivno, Gajim će pretvoriti frazu između $$ i $$ u sliku koristeći "
 "dvips i pretvoriti prije ubacivanja u prozor s razgovorom."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Vrijeme neaktivnosti potrebno da bi se prozor za promjenu statusa zatvorio."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3991,7 +3996,7 @@ msgstr ""
 "Maksimalan broj linija koje se ispisuju u razgovorima. Najstarije linije se "
 "čiste."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3999,11 +4004,11 @@ msgstr ""
 "Ako je Aktivno, prozori sa obavijestima notification-daemon-a će biti "
 "prikačeni uz ikonu u traci radne površine."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Izaberi interval između dvije provjere nezaposlenosti."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4011,7 +4016,7 @@ msgstr ""
 "Promjeni vrijednost za promjenu veličine latex formule koja se prikazuje. "
 "Veća je viša."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4020,13 +4025,23 @@ msgstr ""
 "Ispravne uri sheme. Samo sheme u ovoj listi će biti prihvaćene kao \"pravi\" "
 "uri."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4034,7 +4049,7 @@ msgstr ""
 "Prioritet će se automatski promjeniti ovistno o vašem statusu. Prioriteti su "
 "definirani u autopriority_* opcijama."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4043,27 +4058,38 @@ msgstr ""
 "odsutan, produženo nedostupan, ne uznemiravaj, nevidljivd. PRIMJEDBA: ova "
 "postavka se koristi samo ako je restore_last_status onemogućen."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Ako je označeno, vraća zadnji korišteni status."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Ako je Neaktivno, nećete više vidjeti avatar u prozoru razgovora."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ako nije uključeno, ne potpisuj prisutnost GPG ključem, čak i kada je GPG "
 "postavljen."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Omogući ESessions enkripciju za ovaj račun."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Treba li Gajim automatski započeti kriptiranu sesiju, ako je to moguće?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4071,30 +4097,30 @@ msgstr ""
 "Poredani popis (odjeljen razmakom) vrsta povezivanja za probati. Može "
 "sadržavati tls, ssl ili plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije korištenja standardne SSL biblioteke."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Popis ssl grešaka koje će se ignorirati, odjeljene razmakom."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4104,11 +4130,11 @@ msgstr ""
 "spajanje."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4116,15 +4142,15 @@ msgstr ""
 "Ako je označeno, Gajim če koristiti vašu IP adresu i proxy koji je definiran "
 "u file_transfer_proxies opcijama za prijenos."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtjev za potvrdom o primitku"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Šalji potvrde o primitku"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4132,11 +4158,11 @@ msgstr ""
 "Prilikom pregovaranja o kriptiranoj sesiji, treba li Gajim pretpostaviti da "
 "želite zapisati vaš razgovor?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je li OpenPGP omogućen za ovog kontakta?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4144,101 +4170,101 @@ msgstr ""
 "Treba li Gajim automatski započeti kriptiranu sesiju sa ovim kontaktom, ako "
 "je to moguće?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "sve ili razmakom odvojen status"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', ili 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ili ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Vraćam se ubrzo"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Vraćam se za nekoliko minuta."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite mi poruku."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Radim"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Vani"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Vani uživam život."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Ne uznemiravaj."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4247,99 +4273,99 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
 "nadimak."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitati modul idle"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Krivi domaćin"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Neispravna lokalna adresa? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registracijske informacije za transport %s nisu došle na vrijeme"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Registrirati se na %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Veza Prekinuta"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Račun %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Neispravan Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4349,77 +4375,84 @@ msgstr ""
 "(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili obrisati (svi "
 "zapisi razgovora će biti izgubljeni)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nedozvoljeni nadimak: %s "
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zabranjen vam je pristup grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Grupni razgovor %s ne postoji."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora je ograničeno."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Morate koristiti vaš registrirani nadimak u grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Soba je uništena"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Možete se pridružiti ovoj sobi umjesto: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Želio bih te dodati na moju listu kontakata."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sada smo pretplaćeni na %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Zahtjev za ukidanjem pretplate od %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sada smo ukinuli pretplatu za %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4429,221 +4462,207 @@ msgstr ""
 "Upotrijebite alate za upravljanje listom kontakata kao što je http://jru."
 "jabberstudio.org/ za uklanjanje"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Lozinka za OpenPGP nije unešena"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Biti će te spojeni na %s bez OpenPGP-a."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Nemoguće dobaviti certifikat izdavača"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Nemoguće dobaviti CRL certifikata"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nemoguće dekriptirati potpis certifikata"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nemoguće dekriptirati CRL potpis"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Nije moguće dekodirati izdavačev javni ključ"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu certifikata"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Greška u CRL potpisu"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Certifikat još nije ispravan"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Certifikat je istekao"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL nije još ispravan"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Format greška u certifikatovom notBefore polju"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Format greška u certifikatovom notAfter polju"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format greška u CRL lastUpdate polju"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format greška u CRL nextUpdate polju"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Nema dovoljno memorije"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Osobno potpisan certifikat u lancu"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Nemoguće dobaviti certifikat lokalnog izdavača"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Nemoguće potvrditi ispravnost prvog certifikata"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Lanac certifikata je pre dugačak"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Certifikat je poništen"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Neispravan CA certifikat"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Pređeno ograničenje duljine putanje"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha certifikata"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Certifikat nije pouzdan"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Certifikat odbijen"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Korištenje ključa ne uključuje potpisivanje certifikata"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Veza sa računom \"%s\" je izgubljena"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Ponovo se spojite ručno."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Poslužitelj %(name)s je krivo odgovorio na zahtjev za registraciju: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Poslužitelj %s je pružio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Nepravilan odgovor"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Prijenos %(name)s je krivo odgovorio na zahtjev za registraciju: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nije moguća veza sa \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Provjerite svoju vezu ili pokušajte kasnije."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Spremljeno u: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Veza na proxy nije uspjela"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Neuspješno povezivanje na račun %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Veza sa računom %s je izgubljena. Pokušajte ponovno spajanje."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentičnost certifikata %s bi mogla biti neispravna."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4652,7 +4671,7 @@ msgstr ""
 "\n"
 "SSL Greška: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4661,24 +4680,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Provjerite vašu vezu ili pokušajte ponovno kasnije"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikacija sa \"%s\" nije uspjela"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Molim vas da provjerite korisničko ime i lozinku za greške."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom brisanja liste privatnosti"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4687,30 +4706,30 @@ msgstr ""
 "Lista privatnosti %s nije uklonjena. Možda je aktivna u nekom od vaših "
 "spojenih resursa. Obustavite ju i pokušajte ponovno."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Nije moguće poslati prazne datoteke"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Niti je udaljena prisutnost potpisana, niti je dodijeljen ključ."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "Kontaktov ključ (%s) se ne podudara s ključem dodjeljenim u Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *kriptirana* (Vidi :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4719,30 +4738,40 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Pozovi _Kontakte"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Veza Prekinuta"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Posmatrači"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Prijenosi"
 
@@ -4751,14 +4780,19 @@ msgid "Not in roster"
 msgstr "Nije na Listi Kontakata"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Ovom računalu nedostaju D-Bus python poveznice"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogućnosti Gajima ne mogu se koristiti"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
@@ -4833,56 +4867,69 @@ msgid "eleven"
 msgstr "jedanaest"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s sati"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "pet poslije %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "deset poslije %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "četvrt poslije %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "dvadeset poslije %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "dvadeset pet poslije %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s i pola"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "dvadeset i pet do %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "dvadeset do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "četvrt do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "deset do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "pet do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s sati"
 
@@ -4950,190 +4997,190 @@ msgstr "Neispravan znak u imenu računala."
 msgid "Invalid character in resource."
 msgstr "Neispravan znak u resursu."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Dostupan"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Povezujem"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Odspojen"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Odspojen"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Ima greške"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Pretplata koju već imamo:Ništa"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za Pretplatu):Ništa"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Sudionici"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Sudionik"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Posjetitelj"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Član"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "obraća pažnju na razgovor"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "piše poruku..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "stanka pri pisanju poruke"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5141,22 +5188,22 @@ msgstr[0] "%d poruka na čekanju"
 msgstr[1] "%d poruke na čekanju"
 msgstr[2] "%d poruka na čekanju"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr "iz sobe %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr "od korisnika %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5164,12 +5211,12 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaja na čekanju"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Greška u izvršavanju \"%(command)s\": %(error)s"
@@ -5185,11 +5232,11 @@ msgstr "%s nije ispravna razina zapisnika (loglevel)"
 msgid "error: cannot open %s for reading"
 msgstr "greška: nemogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "migriram bazu zabilješki u indekse"
 
@@ -5841,7 +5888,7 @@ msgstr ""
 "otkazan."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5849,7 +5896,7 @@ msgstr ""
 "[Ovo je dio kriptirane poruke. Ukoliko vidite ovu poruku nešto je pošlo po "
 "zlu.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5858,17 +5905,29 @@ msgstr ""
 "Domaćin %s koji ste postavili kao ft_add_hosts_to_send naprednu opciju nije "
 "ispravan, biti će ignoriran."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Lozinka za OpenPGP nije unešena"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Biti će te spojeni na %s bez OpenPGP-a."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Ako želite nastaviti sa slanjem i primanjem poruka, morati će te se ponovno "
 "spojiti."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5877,31 +5936,31 @@ msgstr ""
 "%s\n"
 "Poruke lokalne veze možda ne rade kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Molimo provjerite da su Avahi ili Bonjour instalirani."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalnu uslugu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemoguće vezanje na port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Molim provjerite da li je avahi-daemon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nije moguće promjeniti status računa \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5909,20 +5968,20 @@ msgstr ""
 "Niste spojeni ili ste nevidljivi za druge. Vašu poruku nije moguće poslati."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Ova poruka je kriptirana]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Vašu poruku nije moguće poslati."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je odspojen. Vašu poruku nije moguće poslati."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5934,24 +5993,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja usluge. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Predefinirana Poruka"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Riječnik za jezik %s nije dostupan"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5961,210 +6020,216 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Prijaviti se odmah?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ako želite da se sve promjene odmah primjene, morate se ponovo prijaviti."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računalu"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju prije uklanjanja ovog računa."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
 "nastaviti?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na poslužitelj"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promjenu imena računa morate se odspojiti."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Da bi ste mogli promjeniti ime računa, morate pročitati sve čekajuće događaje"
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Ime Računa Već Upotrebljeno"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Ovo ime već koristi vaš drugi račun. Molim odaberite drugo ime."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Neispravno ime računa"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Ime računa ne može biti prazno."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Ime računa ne može sadržavati razmake."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Preimenuj Račun"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za račun %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID mora biti forme \"korisnik@poslužitelj\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Neuspješno dohvaćanje tajnih ključeva"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Došlo je do problema pri dohvaćanju vaših OpenPGP tajnih ključeva."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite svoj OpenPGP ključ"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Takav račun nije dostupan"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez veze sa poslužiteljom nije moguća izmjena osobnih informacija."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš poslužitelj ne podržava Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Vaš poslužitelj nije u mogućnosti spremiti vaše osobne informacije."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Za promjenu imena računa morate se odspojiti."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Račun Lokalno već postoji."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Molim uklonite ili preimenujte prije omogućivanja poruka lokalne veze."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Izmjena %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registrirati se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Ban Lista"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Lista Članova"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Lista Vasnika"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Lista Administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Zabranjivanje..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6172,11 +6237,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Dodaja Člana..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6184,11 +6249,11 @@ msgstr ""
 "<b>Koga želite učiniti članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Dodavanje Vlasnika..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6196,11 +6261,11 @@ msgstr ""
 "<b>Koga želite učiniti vlasnikom?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Dodajem Administratora..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6208,7 +6273,7 @@ msgstr ""
 "<b>Koga želite učiniti administratorom?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6225,58 +6290,58 @@ msgstr ""
 "4. domena (sama domena se poklapa, kao i bilo koji korisnik@domena,\n"
 "domena/resurs, ili adresa koja sadrži poddomenu."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje %s računa"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Predefinirano"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?ispis_statusa:Sve"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Samo ulasci i izlasci"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?ispis_statusa:Ništa"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Ova knjižna oznaka ima neispravne podatke"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6284,65 +6349,64 @@ msgstr ""
 "oznaku."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Nedozvoljeni nadimak: %s "
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Neispravan poslužitelj"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Napredne opcije računa možete urediti pritiskom na gumb Napredno, ili "
 "kasnije klikom na Korisnički Računi u izborniku Uredi."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi račun je uspješno stvoren"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo specificirajte poslužitelj na koji se želite registrirati."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Certifikat je već na listi"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ovaj certifikat je već u datoteci %s, neće biti ponovno dodan."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6357,7 +6421,7 @@ msgstr ""
 "SSL Greška: %(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6368,63 +6432,63 @@ msgstr ""
 "SHA1 otisak certifikata:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Prva Poruka Primljena"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Sljedeća Poruka Primljena sa Fokusom"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Sljedeća Poruka Primljena bez Fokusa"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakt Spojen"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakt Odspojen"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Poruka Poslana"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Primljen Gmail Email"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6434,7 +6498,7 @@ msgstr ""
 "primljena sa druge strane. Ukoliko se ova ikona zadrži\n"
 "duže vremena moguće je da je poruka izgubljena."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6442,74 +6506,74 @@ msgstr ""
 "Tekst niže od ove linije je ono što je rečeno od kad ste\n"
 "zadnji puta obraćali pozornost na ovaj grupni razovor"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Izlaz"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Potražiti u _Riječniku"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL-u riječnika nedostaje \"%s\" i nije WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Web Pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Otvori kao _Poveznicu"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Jučer"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "Prije %i dana"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je već na listi"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber ID koji ste unjeli je već na popisu. Izaberite drugi."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "novi@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novi%d@jabber.id"
@@ -6544,119 +6608,119 @@ msgstr "Ime kontakta"
 msgid "Set Mood"
 msgstr "Postavi Raspoloženje"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna Poruka"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Statusna Poruka"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Prepiši Statusnu Poruku?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ovo ime se već koristi. Želite prepisati ovu statusnu poruku?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Snimiti kao Unaprijed Postavljenu Statusnu Poruku"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Molim unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM Adresa:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN Adresa:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresa:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati za račun %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Neispravan Korisnički ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne smije sadržavati resurs."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Nemoguće dodati samog sebe na vlastitu listu."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakt je već na listi"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Ovaj kontakt je već na vašoj listi kontakata."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "ID Korisnika:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klijent"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ Verzija:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK Verzija:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Trenutni Razvojni Programeri:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Prošli Razvojni Programeri:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "ZAHVALE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Zadnje, ali ne najmanje, željeli bismo se zahvaliti svim održavateljima "
 "paketa"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Adrian C. <anrxc@sysphere.org>\n"
@@ -6664,7 +6728,7 @@ msgstr ""
 "Armando V. <synan@rilinux.hr>\n"
 "Vedran M. <rivanvx@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6676,88 +6740,98 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Nadimak sadrži nedozvoljene znakove."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zahtjev za pretplatu na račun %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtjev za pretplatom od %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se pridružiti grupnom razgovoru ukoliko niste spojeni."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružiti se Grupnom Razgovoru sa računom %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Neispravno ime računa"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Račun sa kojeg želite ući u sobu"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Neispravan Nadimak"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Jabber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Ovaj račun nije spojen sa poslužiteljem"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete sinkronizirati sa računom ukoliko nije spojen."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Sinkroniziraj"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započeti Razgovor sa računom %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Započeti Razgovor"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6766,302 +6840,302 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molim potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Neispravan JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće učitati \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promjena lozinke."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Morate unesti lozinku."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt Se Prijavio"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt Se Odjavio"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nova Jedna Poruka"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jedna Poruka koristeći račun %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jedna Poruka u računu %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Jedna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Poslati %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Forma %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Konzola"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Želio bih Vas dodati na moju listu kontakata."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Adresa:"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Zlovoljan"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Grupa"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Želio bih te dodati na moju listu kontakata."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista Privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista Privatnosti za %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Redoslijed: %(order)s, akcija: %(action)s, tip: %(type)s, vrijednost: %"
 "(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosljed: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmjena pravila</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste Privatnosti za %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Neispravno Ime Liste"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate unesti ime za stvaranje liste privatnosti."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste na grupni razgovor"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vas je pozvao da se uključite u raspravu."
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact vas je pozvao na grupni razgovor %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Želite li prihvatiti poziv?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Odabir Zvuka"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Odabir Slike"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje Posebne Obavijesti za %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Uvjet"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7072,19 +7146,19 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Kontaktov identitet potvrđen"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Potvrdi ponovno..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7094,19 +7168,19 @@ msgstr ""
 "ili slati vama poruke, morate potvrditi njihov identitet klikom na dugme "
 "ispod."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktov identitet NIJE potvrđen"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Jeste li potvrdili kontaktov identitet?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7121,22 +7195,22 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Jeste li razgovarali sa drugom stranom i potvrdili SAS?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktov ključ (%s) <b>se ne podudara</b> sa ključem dodijeljenim u Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ovaj kontakt nema dodijeljeni GPG ključ. Nije moguće kriptirati poruke."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7145,7 +7219,7 @@ msgstr ""
 "ključu</b>, tako da poruke <b>nemogu</b> biti kriptirane. Promjenite razinu "
 "povjerenja u njegov ključ sa GPG klijentom."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7240,20 +7314,20 @@ msgstr "Opis"
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Knjižna oznaka je već postavljena"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Grupni Razgovor \"%s\" je već u vašim knjižnim oznakama."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Knjižna oznaka je bez uspješno dodana"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Možete upravljati vašim knjižnim oznakama pomoću izbornika Akcije u vašem "
@@ -7267,15 +7341,15 @@ msgstr "Pretplaćeno"
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Pretplatiti se"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Ukinuti pretplatu"
 
@@ -7730,31 +7804,31 @@ msgstr "Gajim treba X poslužitelj za rad. Izlaz..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim treba pyGTK 2.8 ili viši"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim needs PyGTK 2.8 ili viši za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim treba GTK 2.8 ili viši"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim treba GTK 2.8 ili viši za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ nema podršku za libglade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7763,21 +7837,21 @@ msgstr ""
 "Molim uklonite svoj trenutni GTK+ i instalirajte posljednju stabilnu verziju "
 "sa %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Molim provjerite da GTK+ i PyGTK imaju podršku za libglade na vašem sustavu"
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim treba PySQLite2 za pokretanje"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7787,11 +7861,11 @@ msgstr ""
 "na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7799,35 +7873,35 @@ msgstr ""
 "Trenutno je već pokrenuta jedna instanca Gajima\n"
 "Svejedno pokrenuti?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Unesite GPG lozinku za ključ %(keyid)s (račun %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "GPG ključ nije dodjeljen"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Biti će te spojeni na %s bez OpenPGP-a."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Kriva Lozinka"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Molim ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7838,59 +7912,59 @@ msgstr ""
 "registriran od strane drugog učesnika.\n"
 "Molimo unesite drugi nadimak ispod:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Prihvaćate li ovaj zahtjev?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvaćate li ovaj zahtjev na računu %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Veza Prekinuta"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Zahtjev za Pretplatom"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" vam je dozvolio da vidite njegov ili njezin status."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7898,78 +7972,78 @@ msgstr ""
 "Uvijek ćete vidjeti njega ili nju kao odspojenu.\n"
 "Želite li ukloniti njega ili nju sa vaše liste kontakata?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Ukinuti pretplatu"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s je postavio temu na %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svakom sudioniku je sada dopušteno da vidi vaš puni JID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Soba od sada prikazuje nedostupne članove"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "Soba od sada ne prikazuje nedostupne članove"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Došlo je do non-privacy-related promjene u postavkama sobe"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Soba je sada non-anonymous"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada semi-anonymous"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Soba je sada fully-anonymous"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Potrebna je lozinka za pridruživanje grupnom razgovoru %s. Molim unesite je."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7977,20 +8051,25 @@ msgstr ""
 "Postavili ste Gajim da koristi GPG agent, ali GPG agent nije pokrenut ili je "
 "odgovorio sa krivom lozinkom.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste spojeni bez OpenPGP ključa."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije točna"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Vaša lozinka nije točna"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7998,13 +8077,14 @@ msgid ""
 msgstr ""
 "Ovaj kontakt nema dodijeljeni GPG ključ. Nije moguće kriptirati poruke."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8013,12 +8093,12 @@ msgstr ""
 "Gnome Keyring je instaliran, ali nije \t\t\t\t\t\t\tispravno pokrenut "
 "(vjerovatno varijabla okruženja nije \t\t\t\t\t\t\tispravno postavljena)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi E-mail na %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8026,7 +8106,7 @@ msgstr[0] "Imate %d novi E-mail razgovor"
 msgstr[1] "Imate %d nova E-mail razovora"
 msgstr[2] "Imate %d novih E-mail razgovora"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8041,44 +8121,44 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vam želi poslati datoteku."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Uspješno ste primili %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspješno ste poslali %(filename)s %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8087,46 +8167,46 @@ msgstr ""
 "Nemoguće dekriptirati poruke od %s\n"
 "Možda ih je netko izmjenio."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Nemoguće dekriptirati poruku"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Molim unesite novo korisničko ime za vaš lokalni račun"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Greška."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Konflikt Resursa"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Već ste spojeni na ovaj račun sa istim resursom. Molim unesite novi."
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Greška kod ovjere SSL certifikata"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8137,15 +8217,15 @@ msgstr ""
 "(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriraj ovu grešku za ovaj certifikat."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Greška SSL certifikata"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8161,11 +8241,11 @@ msgstr ""
 "\n"
 "Još uvijek se želite povezati i korigirati otisak certifikata?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Nesigurna Veza"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8173,11 +8253,11 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nekriptirane veze. Jeste li sigurni "
 "da želite nastaviti?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, stvarno želim nesigurno povezivanje"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8185,27 +8265,27 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
 "instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije obrisan"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP čvor %(node)s nije obrisan: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Emotikoni onemogućeni"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Postavljena tema emotikona nije pronađena, emotikoni su onemogućeni."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8215,13 +8295,13 @@ msgstr ""
 "format emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/"
 "Emoticons za više detalja."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nije moguće pridruživanje grupnom razgovoru dok ste nevidljivi"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
@@ -8255,12 +8335,13 @@ msgstr ""
 "odvojenoj liniji"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "račun"
 
@@ -8287,9 +8368,9 @@ msgstr ""
 "jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, ne "
 "uznemiravaj, nevidljiv"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "poruka"
 
@@ -8307,22 +8388,47 @@ msgstr ""
 "statusom\""
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Mjenja status jednog računa ili više njih"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_tet:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Želim se _registrirati novi račun"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"izmjena statusa računa \"račun\". Ako nije određeno, pokušaj promjene "
+"statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim "
+"statusom\""
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Prikazuje dialog razgovora kako bi mogli slati poruke kontaktu"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontakta sa kojim želite razgovarati"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je označeno, kontak se uzima sa kontakt liste ovog računa"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8332,29 +8438,29 @@ msgstr ""
 "Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo postavite "
 "'OpenPGP ključ' kao ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp ključ"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je označeno, poruka će biti kriptirana koristeći ovaj javni ključ"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je označeno, poruka će biti poslana koristeći ovaj račun"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8364,134 +8470,134 @@ msgstr ""
 "želite postaviti samo 'račun', bez 'OpenPGP ključa', postavite 'OpenPGP "
 "ključ' kao ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku grupnom razgovoru kojem ste pristupili."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID kontakta"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o računu"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Ime računa"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Putanja datoteke"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "ako je označeno, datoteka će biti poslana koriteći ovaj račun"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Prikatuje sve postavke i njihove vrijednosti"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrijednost 'ključa' na 'vrijednost'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ključ=vrijednost"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ključ' je ime postavke, 'vrijednost' je vrijednost na koju će se postaviti"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Briše element postavke"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "ime postavke koja će se brisati"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim postavku u .config datoteku"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Dodaje novi kontakt ovom računu"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ukoliko nije određen račun)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ukoliko nije određen račun)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvaranje dialoga 'Započeti Razgovor'"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Započinje razgovor, koristeći ovaj račun"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Šalje korisnički XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8499,72 +8605,72 @@ msgstr ""
 "Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
 "na sve račune"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Rukuj xmpp:/ adresama"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI za obraditi"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Račun sa kojim želite obraditi"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Pridruživanje Novoj Sobi"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "soba"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "JID Sobe"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Nadimak koji će se koristiti"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Lozinka za ulaz u sobu"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Račun sa kojeg želite ući u sobu"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Provjerite da li je Gajim pokrenut"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8573,15 +8679,15 @@ msgstr ""
 "'%s' nije na vašoj listi.\n"
 "Molim odredite račun za slanje poruke."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim nije pokrenut. Nije moguće koristiti gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8590,16 +8696,16 @@ msgstr ""
 "Uporaba: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8608,7 +8714,7 @@ msgstr ""
 "Uporaba: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8617,7 +8723,7 @@ msgstr ""
 "Previše argumenata. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8626,7 +8732,7 @@ msgstr ""
 "Argument \"%(arg)s\" nije određen. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Krivi uri"
 
@@ -8655,290 +8761,152 @@ msgstr "Ne možete izbrisati svoju trenutnu temu"
 msgid "Please first choose another for your current theme."
 msgstr "Molim prvo odaberite neku drugu temu za trenutnu."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Više niste u grupnom razgovoru \"%(room)s\" ili je \"%(nick)s\" otišao."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Razgovor sa"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Zapisivanje razgovora u sobi je omogućeno"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Nova soba je stvorena"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Poslužitelj je dodijelio ili promjenio vaš nadimak"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup od strane %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "pripadnost promjenjena"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe promjenjena na members-only"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "zaustavljanje sustava"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Pripadnost %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Pripadnost %(nick)s je postavljena na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Nadimak nije pronađen: %s "
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Ovaj grupni razgovor nema temu"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Pozvali ste %(contact_jid)s na %(room_jid)s"
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Nadimak nije pronađen: %s "
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Uporaba: /%s <nickname|JID> [razlog], zabranjuje pristup JID-u u sobu. "
-"Nadimak učesnika može biti zamjenjen, ali ne ako sadrži \"@\". Ako je JID "
-"trenutno u sobi, on/ona/ono će biti izbačen(a/o). Razmaci u imenima NISU "
-"podržani."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Uporaba: /%s <nickname>, otvara privatni razgovor sa navedenim učesnikom."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Uporaba: /%s [razlog], zatvara trenutni prozor ili karticu, i prikazuje "
-"razlog ako je specificiran."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Uporaba: /%s <JID> [razlog], poziva JID u trenutni grupni razgovor, "
-"opcionalno dajući razlog."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Uporaba: /%s <soba>@<poslužitelj>[/nadimak], nudi mogućnost spajanja na "
-"sobu@poslužitelj koristeći navedeni nadimak."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Uporaba: /%s <nickname> [razlog], uklanja učesnika specificiranog nadimkom "
-"iz grupnog razgovora i opcionalno prikazuje razlog. NE podržava razmake u "
-"nadimku."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Uporaba: /%s <nickname> [poruka], otvara prozor privatne poruke i šalje "
-"poruku učesniku navedenom nadimkom."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Uporaba: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom razgovoru."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Uporaba: /%s , prikazuje imena učesnika u grupnom razgovoru."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Uporaba: /%s [tema], prikazuje ili ažurira temu grupnog razgovora."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Uporaba: /%s <message>, šalje poruku bez gledanja za ostale komande."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Uporaba: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom razgovoru."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Ako zatvorite ovaj prozor, biti ćete odspojeni iz ovog grupnog razgovora."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Mijenjanje Teme"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Molim specificirajte novu temu:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Mijenjam Nadimak"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molim specificirajte novi nadimak ako ga želite koristiti:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8946,22 +8914,22 @@ msgstr ""
 "Definitivno će te uništiti ovu sobu.\n"
 "Ispod možete navesti razlog:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
@@ -9033,6 +9001,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Snimiti Sliku kao..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Novi Grupni Razgovor"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Želio bih vas dodati na svoju listu kontakata"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći bazu podataka zapisa"
@@ -9117,52 +9093,62 @@ msgstr "Povijest Razgovora sa %s"
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Poruka Greške: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Greška."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stauts je trenutno: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Niste spojeni na poslužitelj."
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Da li zaista želite ukloniti odabranu poruku?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Grupni Razgovori"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Poruke"
 
@@ -9223,18 +9209,18 @@ msgstr "_Ignoriraj"
 msgid "Retrieving profile..."
 msgstr "Dohvaćam profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Nemogu učitati sliku"
 
@@ -9266,46 +9252,46 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte "
 "ponovno kasnije."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Odobrenje je poslano"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će \"%s\" znati vaš status."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Zahtjev za pretplatom je poslan"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ako \"%s\" prihvati ovaj zahtjev znati će te njegov/njezin status."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Odobrenje je uklonjeno"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Sudjelujete u jednom ili više grupnih razovora"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9313,28 +9299,28 @@ msgstr ""
 "Promjena vašeg statusa u nevidljivo rezultirati će odspajanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "desinkroniziran"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Imte nepročitane poruke"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9342,16 +9328,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ukoliko imate omogućenu "
 "povijest i kontakt je na vašoj listi."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati prije uklanjanja ovog prijenosa."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Prijenos \"%s\" biti će uklonjen"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9359,11 +9345,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji "
 "koriste ovaj prijenos."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Prijenos će biti uklonjen"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9372,57 +9358,69 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovih "
 "prijenosa: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Spremate se stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Preimenuj Kontakt"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Preimenuj Grupu"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Ukloni Grupu"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno ukloni i sve kontakte iz ove grupe sa liste kontakata"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Dodjeli OpenPGP Ključ"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za dodavanje kontaktu"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" biti će uklonjen sa vaše liste kontakata"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9431,11 +9429,11 @@ msgstr ""
 "će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Želite li nastaviti?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9443,16 +9441,16 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno po pretpostavljenom uklanjate i odobrenje "
 "što konačno znači da će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status nakon uklanjanja"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa vaše liste kontakata"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9462,20 +9460,34 @@ msgstr ""
 "ujedno uklanjate i odobrenje što konačno znači da će vas ta osoba uvijek "
 "vidjeti kao da ste odspojeni."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Spremate se stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate stvoriti račun prije nego što možete razgovarati sa drugim kontaktima."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9483,13 +9495,13 @@ msgstr ""
 "Vaš poslužitelj ne podržava spremanje informacija metakontakata. Te "
 "informacije neće biti spremljene kod sljedećeg spajanja."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Spremate se stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9499,11 +9511,11 @@ msgstr ""
 "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
 "prijenosa."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9511,12 +9523,12 @@ msgstr[0] "Želite li poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Želite li poslati ove datoteke kontaktu %s:"
 msgstr[2] "Želite li poslati ove datoteke kontaktu %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Poslati %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Učini %s i %s pseudokontaktima"
@@ -9526,115 +9538,127 @@ msgstr "Učini %s i %s pseudokontaktima"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "na %s račun"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje Knjižni_m Oznakama..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "računa %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "za račun %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Izmjena Statusne Poruke"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Objavi Glazbu"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Postavi Usluge..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maksimiziraj Sve"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Pošalji _Grupnu Poruku"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Svim spojenim korisnicima"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Želio bih vas dodati na svoju listu kontakata"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Upravljanje Kontaktima"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Izmjeni _Grupe"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Pošalji Jednu Poruku"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Izvrši Naredbu..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Upravljanje Prijenosom"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Izmjeni Prijenos"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Preimenuj"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maksimiziraj"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Odspoji"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Novi Grupni Razgovor"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Odspoji"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Upravitelj Zapisima"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Pridruži se Novom Grupnom Razgovoru"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Promijeni Statusnu Poruku..."
 
@@ -9651,20 +9675,20 @@ msgstr "Greška u primljenom podatkovnom obrascu"
 msgid "No result"
 msgstr "Nema rezultata"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Disk WriteError"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Potvrdi ove sesijske postavke"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9679,7 +9703,7 @@ msgstr ""
 "\n"
 "\tJesu li te postavke prihvatljive?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9874,6 +9898,133 @@ msgstr "Niti jedan zahtjev za pretplatu nije u toku."
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Dodaj Posebnu _Obavijest"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Pridruži Open_PGP Ključ"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Naredba nije podržana za zeroconf račun."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Komanda: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Uporaba: /%s, prazni tekstualni prozor"
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Uporaba: /%s, sakriva dugmadi."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Uporaba: /%(command)s <action>, šalje akciju trenutnom grupnom razgovoru. "
+#~ "Koristi treću osobu. (npr. /%(command)s eksplodira.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Uporaba: /%s, šalje ping kontaktu"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Uporaba: /%s, šalje poruku kontaktu"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Nema informacija ni pomoći za /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Omogući lokalnu vezu/zeroconf poruke"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Nadimak nije pronađen: %s "
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Ovaj grupni razgovor nema temu"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Pozvali ste %(contact_jid)s na %(room_jid)s"
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Nadimak nije pronađen: %s "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Uporaba: /%s <nickname|JID> [razlog], zabranjuje pristup JID-u u sobu. "
+#~ "Nadimak učesnika može biti zamjenjen, ali ne ako sadrži \"@\". Ako je JID "
+#~ "trenutno u sobi, on/ona/ono će biti izbačen(a/o). Razmaci u imenima NISU "
+#~ "podržani."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Uporaba: /%s <nickname>, otvara privatni razgovor sa navedenim učesnikom."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Uporaba: /%s [razlog], zatvara trenutni prozor ili karticu, i prikazuje "
+#~ "razlog ako je specificiran."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Uporaba: /%s <JID> [razlog], poziva JID u trenutni grupni razgovor, "
+#~ "opcionalno dajući razlog."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Uporaba: /%s <soba>@<poslužitelj>[/nadimak], nudi mogućnost spajanja na "
+#~ "sobu@poslužitelj koristeći navedeni nadimak."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Uporaba: /%s <nickname> [razlog], uklanja učesnika specificiranog "
+#~ "nadimkom iz grupnog razgovora i opcionalno prikazuje razlog. NE podržava "
+#~ "razmake u nadimku."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Uporaba: /%s <nickname> [poruka], otvara prozor privatne poruke i šalje "
+#~ "poruku učesniku navedenom nadimkom."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Uporaba: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom razgovoru."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Uporaba: /%s , prikazuje imena učesnika u grupnom razgovoru."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr "Uporaba: /%s [tema], prikazuje ili ažurira temu grupnog razgovora."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Uporaba: /%s <message>, šalje poruku bez gledanja za ostale komande."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Uporaba: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom razgovoru."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Kliknite da bi vidjeli mogućnosti (kao što su MSN, ICQ transporti) jabber "
diff --git a/po/it.po b/po/it.po
index ec4fe5297..ddc96dd9d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:53+0200\n"
 "Last-Translator: neoex <neoex.dc@gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -216,6 +216,7 @@ msgstr "<b>Informazioni personali</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Account"
 
@@ -282,8 +283,8 @@ msgstr "Modifica informazioni personali..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -294,8 +295,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Generale"
 
@@ -355,25 +356,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informazioni su di te, archiviate sul server"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Nessuno"
 
@@ -530,8 +527,8 @@ msgstr ""
 "Potresti considerare di cambiare la configurazione del firewall"
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "ID Jabber: "
 
@@ -545,7 +542,7 @@ msgid "Mer_ge accounts"
 msgstr "_Unisci account"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Ri_nomina"
 
@@ -805,7 +802,7 @@ msgid "All statuses"
 msgstr "Tutti gli stati"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Assente"
 
@@ -822,7 +819,7 @@ msgid "Have "
 msgstr "Ho "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Invisibile"
 
@@ -831,7 +828,7 @@ msgid "Launch a command"
 msgstr "Lancia un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Non disponibile"
 
@@ -1022,7 +1019,7 @@ msgid "Join _Group Chat"
 msgstr "Entra in chat di _gruppo"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Aggiungi ai contatti..."
 
@@ -1048,40 +1045,6 @@ msgstr "_Apri il collegamento nel browser"
 msgid "_Start Chat"
 msgstr "_Inizia chat"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Invite _Contacts"
-msgstr "_Gestisci contatti"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Invia _file"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Attiva cifratura end-to-end"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Attiva cifratura Open_PGP"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Aggiungi ai contatti"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Cronologia"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "In_vita"
@@ -1106,6 +1069,122 @@ msgstr ""
 "Stai per iniziare una chat di gruppo.\n"
 "Scegli i contatti che vuoi invitare"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "_Chiedi di poter vedere il suo stato"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Aggiungi _notifica speciale..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Assegna chiave Open_PGP..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Esegui comando..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Modifica _gruppi..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "In_vita a "
+
+#: ../data/glade/contact_context_menu.glade.h:7
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "_Gestisci contatti"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Elimina"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Invia s_tato personalizzato"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Invia _messaggio singolo..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Invia _file..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Imposta _avatar personalizzato..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Inizia _chat"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Attiva cifratura end-to-end"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Attiva cifratura Open_PGP"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "Permetti di _vedere il mio stato"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Blocca"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Proibisci di vedere il mio stato"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Cronologia"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Gestisci contatto"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Rinomina..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Abbonamento"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Sblocca"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "nove"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Completa nel form."
@@ -1226,7 +1305,7 @@ msgstr ""
 "Contatto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Grassetto"
 
@@ -1250,7 +1329,7 @@ msgstr "Andato via"
 msgid "Inactive"
 msgstr "Inattivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Corsivo"
 
@@ -1322,6 +1401,14 @@ msgstr "Mo_deratore"
 msgid "Occupant Actions"
 msgstr "Azioni partecipante"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Invia _file"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Aggiungi ai contatti"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Amministratore"
@@ -1330,13 +1417,6 @@ msgstr "_Amministratore"
 msgid "_Ban"
 msgstr "_Bandisci"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Blocca"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Caccia"
@@ -1353,13 +1433,6 @@ msgstr "_Proprietario"
 msgid "_Send Private Message"
 msgstr "_Invia messaggio privato"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Sblocca"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voce"
@@ -1368,7 +1441,7 @@ msgstr "_Voce"
 msgid "Create new post"
 msgstr "Crea nuovo post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Da"
 
@@ -1400,8 +1473,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gestore cronologia di Gajim"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Elimina"
 
@@ -1447,34 +1520,38 @@ msgstr "Cerca"
 msgid "_Log conversation history"
 msgstr "_Memorizza cronologia conversazione"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+msgid "Bookmark this room"
+msgstr ""
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Entra in chat di gruppo"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Entra automaticamente in questa stanza alla connessione"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Nickname:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Password:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Recenti:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Entra"
@@ -1503,7 +1580,7 @@ msgstr "Minimizza automaticamente"
 msgid "Print status:"
 msgstr "Scrivi stato:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2055,7 +2132,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "_Ordina i contatti per stato"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Stato"
 
@@ -2224,34 +2301,39 @@ msgid "All"
 msgstr "a tutti"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "a tutti per abbonamento"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Permetti"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Nega"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "ID Jabber"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Ordine:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Lista privacy"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "a tutti per abbonamento"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "a tutti nel gruppo"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2263,19 +2345,19 @@ msgstr ""
 "da\n"
 "a"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "di inviarmi messaggi"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "di inviarmi richieste"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "di inviarmi uno stato"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "di vedere il mio stato"
 
@@ -2467,98 +2549,11 @@ msgstr "Rimuovi l'account da Gajim e dal _server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Elimina"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "_Chiedi di poter vedere il suo stato"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Aggiungi _notifica speciale..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Assegna chiave Open_PGP..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Modifica _gruppi..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Esegui comando..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "In_vita a "
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Elimina"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Invia s_tato personalizzato"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Invia _messaggio singolo..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Invia _file..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Imposta _avatar personalizzato..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Inizia _chat"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "Permetti di _vedere il mio stato"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Proibisci di vedere il mio stato"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Gestisci contatto"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Rinomina..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Abbonamento"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "nove"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2681,7 +2676,7 @@ msgid "_Add contact"
 msgstr "_Aggiungi contatto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Informazioni"
 
@@ -2902,26 +2897,6 @@ msgstr "_Messaggio"
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Crea _notifica speciale"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Assegna chiave Open_PGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Modifica _gruppi"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Rinomina"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modifica account..."
@@ -2967,48 +2942,48 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Attivato"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Disattivato"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Intero"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Colore"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Nome preferenza"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Valore"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Nessuna)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Nascosta"
 
@@ -3022,253 +2997,252 @@ msgstr "Hai ricevuto un nuovo evento:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Inglese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgaro"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretone"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Tedesco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Greco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Britannico"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Francese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Croato"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norvegese (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brasiliano"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Serbo"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovacco"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Cinese (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Lingua per la correzione ortografica"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Il messaggio non può venire inviato finché non si è connessi."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Sottolinea"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Servizio"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Carattere:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informazioni sul contatto"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Cifratura attivata"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Non nei contatti"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s della chat di gruppo %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usa autenticazione"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usa autenticazione"
@@ -3276,102 +3250,59 @@ msgstr "Usa autenticazione"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Comandi: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Utilizzo: /%s, pulisce la finestra di testo."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Utilizzo: /%s, nasconde i pulsanti di chat."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Utilizzo: /%s <azione>, invia l'azione alla stanza corrente. Usare la terza "
-"persona (esempio: /%s esplode)."
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Utilizzo: /%s, invia un ping al contatto"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Utilizzo: /%s, invia il messaggio al contatto"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Non esiste aiuto per /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Negoziazione della sessione annullata"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Il seguente messaggio NON è stato cifrato"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "Il seguente messaggio NON è stato cifrato"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3379,23 +3310,23 @@ msgstr ""
 "Se chiudi questa scheda e la cronologia è disabilitata, questo messaggio "
 "verrà perso."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 #, fuzzy
 msgid "Database Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
@@ -3404,23 +3335,23 @@ msgstr "%(nick)s è ora %(status)s"
 msgid "creating logs database"
 msgstr "creazione database log"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s è un file ma dovrebbe essere una cartella"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim sta per uscire"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s è una cartella ma dovrebbe essere un file"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "creazione della cartella %s"
@@ -3484,9 +3415,9 @@ msgstr "Scegliere le chat di gruppo da cui vuoi uscire"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Chat di gruppo"
 
@@ -3502,69 +3433,110 @@ msgstr "Inoltra messaggi non letti"
 msgid "All unread messages have been forwarded."
 msgstr "Tutti i messaggi non letti sono stati inoltrati."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usa D-Bus e Notification-Daemon per mostrare le notifiche"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo in minuti dopo il quale lo stato diventa 'assente'."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Assente per inattività"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo in minuti dopo il quale lo stato diventa 'non disponibile'."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Non disponibile per inattività"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Nickname non valido"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "testo del messaggio di stato"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Nickname non valido"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Cambio nickname"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "testo del messaggio di stato"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (separata da spazi) di linee (account e gruppi) raggruppate."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "predefinito"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Abilità la messaggistica zeroconf sulla rete locale"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Lingua usata dal controllo ortografico"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3574,7 +3546,7 @@ msgstr ""
 "'a volte' - scrive l'ora ogni print_ichat_every_foo_minutes minuti.\n"
 "'mai' - non scrive mai l'ora."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3584,18 +3556,18 @@ msgstr ""
 "o 0 per disabilitarlo. 1 è l'orologio più preciso, 4 è il meno preciso. "
 "Viene usato solo se print_time è 'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratta le coppie di * / _ come possibili caratteri di formattazione."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se Vero, non verranno rimossi */_ . Perciò *abc* verrà mostrato in grassetto "
 "ma senza rimuovere * *."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3604,7 +3576,7 @@ msgstr ""
 "Usa il testo annotato ReStructured per inviare HTML, più la formattazione "
 "ascii se selezionata (se si vuole usare questa opzione, installare docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3612,7 +3584,7 @@ msgstr ""
 "Carattere da aggiungere dopo il nickname quando si usa il completamento nick "
 "(tab) nella chat di gruppo."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3620,7 +3592,7 @@ msgstr ""
 "Carattere da proporre di aggiungere dopo il nickname desiderato quando il "
 "nickname desiderato è già usato da qualcun'altro nella chat di gruppo"
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3631,19 +3603,19 @@ msgstr ""
 "la documentazione della funzione python strftime per ottenere documentazione "
 "completa: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Caratteri scritti prima del nickname nelle conversazioni"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Caratteri scritti dopo il nickname nelle conversazioni"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Aggiungere * e [n] al titolo della lista contatti?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3651,12 +3623,26 @@ msgstr ""
 "Quante linee ricordare dalla precedente conversazione quando una scheda/"
 "finestra di chat viene riaperta."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quanti minuti devono durare le ultime linee dalla conversazione precedente."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3664,11 +3650,11 @@ msgstr ""
 "Inviare il messaggio con Ctrl-Invio e con Invio creare una nuova linea "
 "(comportamento predefinito del client ICQ Mirabilis)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quante linee memorizzare per Ctrl+Alto."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3677,12 +3663,12 @@ msgstr ""
 "URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
 "che significa usare wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se marcato, Gajim può essere controllato da remoto usando gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3694,13 +3680,13 @@ msgstr ""
 "che sia sincronizzato con lo stato globale) basandosi sullo stato della "
 "connessione di rete."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3708,7 +3694,7 @@ msgstr ""
 "Le notifiche di stato mostrate nella finestra di chat. Possono essere una "
 "tra all, composing_only, disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3716,11 +3702,11 @@ msgstr ""
 "Quando non scrivi la data ad ogni messaggio (print_time==sometimes), "
 "scriverla ogni x minuti."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3728,7 +3714,7 @@ msgstr ""
 "Chiedere sempre prima di chiudere una finestra/scheda di chat di gruppo in "
 "questa lista separata da spazi di jid di stanze."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3736,13 +3722,13 @@ msgstr ""
 "Non chiedere mai prima di chiudere una scheda/finestra di chat in questa "
 "lista separata da spazi di jid di stanze."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3752,27 +3738,27 @@ msgstr ""
 "interfacce locali, per il trasferimento file in caso di traslazione "
 "dell'indirizzo/inoltro porte."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Secondo lo standard IEC, KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Notifica gli eventi nell'area di notifica."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Mostrare scheda quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrare bordo per le schede quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3780,18 +3766,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Includere l'anteprima dei nuovi messaggi nelle notifiche popup?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
 "chat multi-utente."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3800,13 +3786,13 @@ msgstr ""
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
 "l'icona nello spazio di notifica."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Se Vero, Gajim controllerà se è il client Jabber predefinito ad ogni avvio."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3814,7 +3800,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà un icona su ogni scheda contenente messaggi non "
 "letti. A seconda del tema, questa icona può essere animata."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3822,11 +3808,11 @@ msgstr ""
 "Se Vero, Gajim mostrerà il messaggio di stato, se non vuoto, per ogni "
 "contatto sotto il nome del contatto nella finestra dei contatti"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3834,7 +3820,7 @@ msgstr ""
 "Se Vero, Gajim chiederà un avatar ad ogni contatto che non aveva un avatar "
 "l'ultima volta o ne ha uno troppo vecchio in cache."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3842,7 +3828,7 @@ msgstr ""
 "Se Falso, non si vedrà più la linea di stato nelle chat quando un contatto "
 "cambia stato o messaggio di stato."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3856,30 +3842,30 @@ msgstr ""
 "i messaggi di stato. Se \"in_and_out\", gajim scriverà solo quando qualcuno "
 "entra od esce dalla chat di gruppo."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Colore di sfondo dei contatti appena collegati."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Colore di sfondo dei contatti appena scollegati."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se Vero, i messaggi recuperati useranno un font più piccolo di quello "
 "predefinito."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Non mostrare l'avatar per il trasporto stesso."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Non mostrare l'account nella taskbar del sistema."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3889,7 +3875,7 @@ msgstr ""
 "finestra lampeggia (comportamento predefinito per la maggior parte dei "
 "gestori di finestre) quando contiene nuovi eventi."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3900,7 +3886,7 @@ msgstr ""
 "SHA nella presenza sulle chat di gruppo"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3921,32 +3907,32 @@ msgstr ""
 "ad una specifica finestra. Nota, cambiare questa opzione richiede il riavvio "
 "di Gajim prima che le modifiche abbiano effetto"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se Falso, l'avatar non verrà mostrato nella finestra di chat"
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Nasconde l'intestazione in una finestra di chat di gruppo"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Nasconde l'intestazione nella finestra di chat a due persone"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Nasconde la lista dei presenti nella stanza nella finestra di chat di gruppo"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3954,15 +3940,15 @@ msgstr ""
 "In una chat, mostra il nickname all'inizio della riga solo quando non è "
 "quello della persona che parlava nel messaggio precedente."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentazione quando si raggruppano nickname consecutivi."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Scorrimento fluido dei messaggi nella finestra di continuazione"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3971,12 +3957,12 @@ msgstr ""
 "Lista di colori che saranno usati per colorare i nickname nelle chat di "
 "gruppo."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab va alla prossima scheda di composizione se nessuna è non letta."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3984,7 +3970,25 @@ msgstr ""
 "Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
 "vuota significa che non verrà mai mostrata."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
+"vuota significa che non verrà mai mostrata."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
+"vuota significa che non verrà mai mostrata."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3994,7 +3998,7 @@ msgstr ""
 "di modifica account. ATTENZIONE, quando si è collegati con priorità "
 "negativa, NON si riceveranno messaggi dal server."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4002,7 +4006,7 @@ msgstr ""
 "Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
 "password degli account."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4011,7 +4015,7 @@ msgstr ""
 "Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
 "password degli account."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4019,7 +4023,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà il numero di account online e totali nelle linee "
 "degli account e dei gruppi."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4027,7 +4031,7 @@ msgstr ""
 "Può essere vuoto, 'chat' o 'normal'. Se non vuoto, tratta tutti i messaggi "
 "in iarrivo come se fossero di questo tipo"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4035,7 +4039,7 @@ msgstr ""
 "Se Vero, Gajim scorrerà e selezionerà il contatto che ti ha mandato l'ultimo "
 "messaggio, se la finestra di chat non è già aperta."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -4043,13 +4047,13 @@ msgstr ""
 "Se Vero, Gajim converterà le stringhe comprese tra $$ e $$ in un'immagine "
 "usando dvips e convertendola prima di inserirla in una finestra di chat."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Tempo di inattività richiesto prima che la finestra di cambiamento del "
 "messaggio di stato si chiuda."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4057,35 +4061,45 @@ msgstr ""
 "Massimo numero di linee che sono visualizzate nelle conversazioni. Le linee "
 "più vecchie verranno cancellate."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4093,68 +4107,79 @@ msgstr ""
 "La priorità cambierà automaticamente rispetto al tuo stato. Le priorità sono "
 "definite nelle opzioni autopriority_*."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Se Falso, l'avatar non verrà mostrato nella finestra di chat"
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Workaround Jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4162,15 +4187,15 @@ msgstr ""
 "Se marcato, Gajim userà l'IP della macchina ed i proxy definiti nell'opzione "
 "file_transfer_proxies per il trasferimento file."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4178,111 +4203,111 @@ msgstr ""
 "Durante la negoziazione di una sessione cifrata, Gajim deve abilitare la "
 "registrazione dei messaggi?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP è abilitato per questo contatto?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Linguaggio per il quale controllare le parole sbagliate"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "tutto o stati separati da uno spazio"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', o 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' o 'both'"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Torno tra qualche minuto."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Sono al telefono."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Sono fuori a divertirmi."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Sono disponibile."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Solo libero per chat."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Non sono disponibile."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Non disturbare."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Ciao ciao!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4290,179 +4315,186 @@ msgstr ""
 "Suono da riprodurre quando un messaggio MUC contiene una delle parole in "
 "muc_highlight_words, o quando un messaggio MUC contiene il tuo nickname."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Host errato"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Indirizzo locale non valido? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Le informazioni di registrazione per il transport %s non sono arrivate in "
 "tempo"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "La vCard è stata pubblicata correttamente"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Migrazione GUI fallita"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname non permesso: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Sei stato bandito dalla stanza %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "La stanza %s non esiste."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Non è permessa la creazione di stanze."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Il tuo nickname è già in uso nella stanza di gruppo %s:"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non sei nella lista dei membri nella chat di gruppo %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "La stanza è stata cancellata"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Puoi invece entrare in questa stanza: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "si è ora abbonati a %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "richiesta di cancellazione abbonamento da %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "è stato ora cancellato l'abbonamento a %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4472,257 +4504,243 @@ msgstr ""
 "strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
 "rimuoverlo"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Non è stata impostata la passphrase OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Ti connetterai a %s senza OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "%s non è un livello di log valido"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Nome utente non valido"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Riconnetti manualmente."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Il server %s ha risposto in maniera errata alla richiesta di registrazione: %"
 "s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Risposta non valida"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Il trasporto %s ha risposto in maniera errata alla richiesta di "
 "registrazione: %s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Connessione al proxy fallita"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Verificare la correttezza di login e password."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Errore durante la rimozione della lista privacy"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4731,31 +4749,31 @@ msgstr ""
 "La lista privacy %s non è stata rimossa. Potrebbe essere attiva in una delle "
 "risorse connesse. Disattivarla e riprovare."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4764,30 +4782,40 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Gestisci contatti"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Non ottenuto a causa di stato invisibile"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Migrazione GUI fallita"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Osservatori"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Trasporti"
 
@@ -4796,14 +4824,19 @@ msgid "Not in roster"
 msgstr "Non nei contatti"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "I binding python per D-Bus sono mancanti su questo computer"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Le potenzialità D-Bus di Gajim non possono essere usate"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "La dipendenza pysqlite2 (o python-pysqlite2) è mancante. Uscita..."
@@ -4882,56 +4915,69 @@ msgid "eleven"
 msgstr "undici"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s in punto"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s e cinque"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s e dieci"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s e un quarto"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s e venti"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s e venticinque"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s e mezza"
 
 #: ../src/common/fuzzyclock.py:46
+#, fuzzy, python-format
 msgid "twenty five to %(1)s"
 msgstr "%(0)s e trentacinque"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "venti alle %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "un quarto alle %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "dieci alle %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "cinque alle %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s in punto"
 
@@ -4999,224 +5045,224 @@ msgstr "Carattere non valido nell'hostname."
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Libero per chat"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Libero per chat"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Disponibile"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "_Assente"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "Ci sono errori"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Nessuna"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Proprietario"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "sta facendo altro"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "sta scrivendo..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "ha smesso di scrivere"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o scheda di chat"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d messaggio in attesa"
 msgstr[1] "%d messaggi in attesa"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " dalla stanza %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " dall'utente %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " da %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento in attesa"
 msgstr[1] "%d eventi in attesa"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5232,11 +5278,11 @@ msgstr "%s non è un livello di log valido"
 msgid "error: cannot open %s for reading"
 msgstr "errore: impossibile aprire %s per lettura"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "Migrazione database delle cronologie agli indici"
 
@@ -5963,13 +6009,13 @@ msgstr ""
 "file verrà annullato."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5978,16 +6024,28 @@ msgstr ""
 "L'host %s che hai configurato come il ft_add_hosts_to_send opzione non è "
 "valida, perciò sarà ignorato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Non è stata impostata la passphrase OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Ti connetterai a %s senza OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Errore avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5996,32 +6054,32 @@ msgstr ""
 "%s\n"
 "La messaggistica sulla rete locale potrebbe non funzionare correttamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Controllare se Avahi è installato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Impossibile avviare il servizio locale"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossibile collegarsi alla porta %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Controllare se avahi-daemon è in esecuzione."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossibile cambiare lo stato dell'account  \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -6030,21 +6088,21 @@ msgstr ""
 "essere inviato."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6057,26 +6115,26 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Errore durante la creazione del servizio. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Messaggi di stato preimpostati"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Abilita"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dizionario per lingua %s non disponibile"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6085,216 +6143,222 @@ msgstr ""
 "E' necessario installare il dizionario %s per usare il controllo "
 "ortografico, o configurare un'altra lingua nelle opzioni speller_language"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Effettuare un nuovo login?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se si vogliono applicare subito i cambiamenti, è necessario effettuare un "
 "nuovo login."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Eventi non letti"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Hai aperto una chat nell'account %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Tutte le finestre di chat e le chat di gruppo saranno chiuse. Desideri "
 "continuare?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Per cambiare nome account, è necessario leggere tutti gli eventi in attesa."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Questo nome è già usato da un altro account. Scegliere un altro nome."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Rinomina account"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Inserisci un nuovo nome per l'account %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "È necessario creare un nuovo account prima di poter modificare le "
 "informazioni personali."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Il server non supporta Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Il server non può salvare le informazioni personali."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Per cambiare nome account, è necessario disconnettersi."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Per favore rinominalo o rimuovilo prima di abilitare la messaggistica sulla "
 "rete locale."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6302,11 +6366,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6314,11 +6378,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6326,11 +6390,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6338,7 +6402,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6356,58 +6420,58 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Tutti"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Solo ingresso ed uscita"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "Nessuno"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Nuova chat di gruppo"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6415,67 +6479,66 @@ msgstr ""
 "segnalibro."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Nickname non valido"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Nickname non permesso: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Server non valido"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Voce non valida"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "È possibile impostare ora le opzioni avanzate premendo il pulsante \"Avanzate"
 "\", o farlo più tardi scegliendo la voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Per favore fornire il server su cui vuoi registrarti."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6485,7 +6548,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6493,72 +6556,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Contatto connesso"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Messaggio inviato"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Email GMail ricevuta"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6567,75 +6630,75 @@ msgstr ""
 "Il testo sotto a questa riga è quanto è stato detto dall'ultima volta che si "
 "è prestata attenzione a questa chat di gruppo"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Esci"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Manca un \"%s\" nell'URL del Dizionario e questo non è WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Apri come _Link"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i giorni fa"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Client IM Jabber"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6670,120 +6733,120 @@ msgstr "Nome contatto"
 msgid "Set Mood"
 msgstr ""
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Sovrascrivere messaggio di stato?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Questo nome è già stato utilizzato. Vuoi sovrascrivere questo messaggio di "
 "stato?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Salva come messaggio di stato predefinito"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Inserire un nome per questo messaggio di stato"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "Indirizzo AIM:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Numero GG:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Numero ICQ:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "Indirizzo MSN:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Indirizzo Yahoo!:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Inserire i dati del contatto che si vuole aggiungere all'account %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Inserire i dati del contatto che si vuole aggiungere"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente deve non contenere una risorsa."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nella lista contatti."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Versione di GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Versione di PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Sviluppatori attuali:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Dulcis in fundo, ringraziamo tutti i gestori dei pacchetti"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
@@ -6791,7 +6854,7 @@ msgstr ""
 "Matteo Dell'Amico <della@linux.it>\n"
 "Daniel Coppi <neoex.dc@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6804,391 +6867,401 @@ msgstr ""
 "\n"
 "L'evidenziazione delle parole errate non verrà usata"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Il nickname contiene caratteri non consentiti."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Richiesta di abbonamento per l'account %s da %s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Si è già nella stanza %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non è possibile unirsi a chat di gruppo quando non si è connessi."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Il nome account non è valido"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nickname non valido"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Questa non è una chat di gruppo"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non è il nome di una chat di gruppo"
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Questo account non è connesso al server"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non puoi sincronizzarti con un account a meno che non sia connesso."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Sincronizza"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "Introdurre il nickname o l'ID del contatto con cui chattare:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossibile processare \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Invito a chat di gruppo"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Stato Contatto Cambiato"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo nell'account %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr " da %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Vorrei aggiungerti alla mia lista contatti."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Indirizzo"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Modifica"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID Jabber: "
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Gruppo"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privacy <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordine: %s, azione: %s, tipo: %s, valore: %s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordine: %s, azione: %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifica una regola</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Liste privacy"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Nome lista non valido"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "È necessario inserire una nome per creare una lista privacy"
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Non si è entrati in una chat di gruppo."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ti ha invitato a partecipare a una discussione"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ti ha invitato alla chat di gruppo %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "Vuoi inviare questo file a %s:"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Creazione notifica speciale per %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Condizione"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "quando io sono "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7196,39 +7269,39 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 #, fuzzy
 msgid "Have you verified the contact's identity?"
 msgstr "Verifica l'identità del client remoto"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7238,26 +7311,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7352,20 +7425,20 @@ msgstr "Descrizione"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Segnalibro già impostato"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "È possibile gestire i segnalibri attraverso il menu Azioni nella finestra "
@@ -7379,15 +7452,15 @@ msgstr "Abbonati"
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Nuovo post"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
@@ -7854,32 +7927,32 @@ msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim ha bisogno di PyGTK 2.8 o superiore"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Gajim ha bisogno di PyGTK 2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim ha bisogno di GTK2.8 o superiore"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim ha bisogno di GTK2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Supporto libglade mancante nel runtime GTK+"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7888,20 +7961,20 @@ msgstr ""
 "Eliminare il runtime GTK+ corrente ed installare l'ultima versione stabile "
 "da %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Verificare che GTK+ e PyGTK abbiano supporto libglade sul sistema."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim ha bisogno di pywin32 per essere eseguito"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7911,11 +7984,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim è già in esecuzione"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7923,34 +7996,34 @@ msgstr ""
 "Un'altra istanza di Gajim sembra essere in esecuzione\n"
 "Continuare comunque?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Inserire la passphrase della chiave GPG per l'account %s."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Ti connetterai a %s senza OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Passphrase errata"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Riscrivere la passphrase GPG o premere Annulla."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7961,169 +8034,175 @@ msgstr ""
 "chat di gruppo %s.\n"
 "Specificare un altro nickname sotto:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errore durante l'invio di %s ( %s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Richiesta di abbonamento"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Disa_bbonati"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Tutti i partecipanti possono vedere il tuo JID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "La stanza ora mostra i membri non disponibili"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "la stanza ora non mostra i membri non disponibili"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "E' stata effettuata una modifica alla configurazione della stanza che non "
 "riguarda la privacy"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "La registrazione dei messaggi della stanza è stata disattivata"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "La stanza è ora completamente non anonima"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "La stanza è ora semi-anonima"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "La stanza è ora completamente anonima"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "È necessaria una password per entrare nella stanza %s. Inserisci la password"
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sei connesso senza la chiave OpenPGP."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Passphrase errata"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Non chiederlo più"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8132,19 +8211,19 @@ msgstr ""
 "Gnome Keyring è installato ma non avviato correttamente (la variabile "
 "d'ambiente è probabilmente impostata in maniera non corretta)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nuova e-mail su %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "C'è %d nuova conversazione in e-mail"
 msgstr[1] "Ci sono %d nuove conversazioni in e-mail"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8154,92 +8233,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(filename)s ricevuto con successo da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Invio di %(filename)s a %(name)s effettuato con successo."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "In tutti i _messaggi"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Conflitto di nomi utenti"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Inserire un nuovo nome utente per l'account locale"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Errore."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Conflitto tra risorse"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 "Sei già connesso a questo account con la stessa risorsa. Inseriscine un'altra"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8247,15 +8326,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8266,63 +8345,63 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Connessione"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
@@ -8354,12 +8433,13 @@ msgid ""
 msgstr "Scrive la lista contatti. Ogni contatto appare su una linea separata"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "account"
 
@@ -8385,9 +8465,9 @@ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno fra: offline, online, chat, assente, xa, non disturbare, invisibile"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "messaggio"
 
@@ -8405,23 +8485,48 @@ msgstr ""
 "\"sincronizza con lo stato globale\""
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Cambia lo stato degli account"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_tà:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Voglio _registrare un nuovo account"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"cambia lo stato dell'account \"account\". Se non specificato, prova a "
+"cambiare lo stato di tutti gli account che hanno marcato l'opzione "
+"\"sincronizza con lo stato globale\""
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Mostra la finestra di chat per mandare messaggi ad un contatto"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contatto con cui si vuole chattare"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se specificato, il contatto è preso dalla lista contatti di questo account"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8431,30 +8536,30 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "chiave pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se specificato, il messaggio verrà cifrato usando questa chiave pubblica"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "se specificato, il messaggio verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8464,138 +8569,138 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "oggetto"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "oggetto del messaggio "
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Invia nuovi messaggi alla chat di gruppo in cui sei entrato."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID della stanza che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nome dell'account"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Invia file ad un contatto"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Percorso file"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chiave' è il nome della preferenza, 'valore' è il valore a cui impostarla"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Elimina un oggetto dalle preferenze"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "chiave"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nome della preferenza da eliminare"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Scrive lo stato corrente delle preferenze di Gajim nel file .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Aggiunge il contatto alla lista"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Aggiunge un nuovo contatto a questo account"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Restituisce lo stato corrente (quello globale se non è specificato un "
 "account)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Restituisce il messaggio di stato corrente (quello globale se non è "
 "specificato un account)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Restituisce il numero di messaggi non letti"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Apre la finestra di inizio chat"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Inizia chat usando questo account"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Invia XML personalizzato"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML da inviare"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8603,79 +8708,79 @@ msgstr ""
 "L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
 "tutti gli account."
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Gestisci un uri xmpp:/"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Account in which you want to handle it"
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Entra in una stanza MUC"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "stanza"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Stanza:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "nickname"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Le password non coincidono"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 #, fuzzy
 msgid "Account from which you want to enter the room"
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Controllare se avahi-daemon è in esecuzione."
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8684,31 +8789,31 @@ msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
 "Specificare l'account per l'invio del messaggio."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8717,7 +8822,7 @@ msgstr ""
 "Utilizzo: %s comando [parametri]\n"
 "Il comando è uno fra:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8726,7 +8831,7 @@ msgstr ""
 "Troppi parametri. \n"
 "Scrivere \"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8735,7 +8840,7 @@ msgstr ""
 "Il parametro \"%s\" non è specificato. \n"
 "Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "URI errato"
 
@@ -8764,297 +8869,152 @@ msgstr "Non è possibile eliminare il tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Non sei più nella stanza \"%s\" o \"%s\" è uscito."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Inserisci nickname"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Cronologia conversazione"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Connessione"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "E' stata creata una nuova stanza"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Il server ha assegnato o modificato il tuo nickname"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bloccato: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato bloccato da %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s è stato cacciato dalla stanza (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "l'affiliazione è stata cambiata"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "la stanza è ora accessibile solo ai membri"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 #, fuzzy
 msgid "system shutdown"
 msgstr "spegnimento del sistema"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s è entrato nella chat di gruppo"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Nickname non trovato: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Questa stanza non ha oggetto"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Nickname non trovato: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Utilizzo: /%s <nickname|JID> [motivo], bandisce il JID dalla stanza. Il "
-"nickname di un partecipante può venire usato al posto del JID, ma non se "
-"contiene \"@\". Se il JID è correntemente nella stanza, verrà anche "
-"cacciato. NON supporta la presenza di spazi nel nickname."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Utilizzo: /%s <nickname>, apre una finestra di chat privata al partecipante "
-"specificato."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Utilizzo: /%s [motivo], chiude la finestra oi scheda corrente, mostrando il "
-"motivo se specificato."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Utilizzo: /%s <JID> [motivo], invita JID alla stanza corrente, opzionalmente "
-"fornendo un motivo."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Utilizzo: /%s <stanza>@<server>[/nickname], offre la possibilità di entrare "
-"in stanza@server, opzionalmente usando il nickname specificato."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Utilizzo: /%s <nickname> [motivo], rimuove il partecipante specificato per "
-"nickname dalla stanza e opzionalmente mostra un motivo. NON supporta la "
-"presenza di spazi nel nickname."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Utilizzo: /%s <nickname> [messaggio], apre una finestra di messaggi privati "
-"ed invia il messaggio al partecipante specificato per nickname."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Utilizzo: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr ""
-"Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
-"corrente."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
-"corrente."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Utilizzo: /%s <messaggio>, invia un messaggio senza considerare gli altri "
-"comandi."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Utilizzo: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Chiudendo questa finestra, si verrà disconnessi da questa stanza."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specificare il nuovo nickname da usare:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Eliminazione %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9062,22 +9022,22 @@ msgstr ""
 "Stai per cancellare definitivamente questa stanza.\n"
 "Puoi specificare il motivo qui sotto:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Puoi anche inserire un nome alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -9152,6 +9112,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Salva immagine come..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Nuova chat di gruppo"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Vorrei aggiungerti ai miei contatti"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare la base dati delle cronologie"
@@ -9236,52 +9204,62 @@ msgstr "Cronologia conversazione con %s"
 msgid "Disk Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ora è %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Messaggio di errore: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Errore."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "L'immagine è troppo grande"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non si è connessi al server"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Si vuole davvero eliminare il messaggio selezionato?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Chat di gruppo"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Chat private"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Messaggi"
 
@@ -9342,18 +9320,18 @@ msgstr "nove"
 msgid "Retrieving profile..."
 msgstr "Recupero profilo..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Il file è vuoto"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Il file non esiste"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Impossibile caricare l'immagine"
 
@@ -9385,46 +9363,46 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprovare più tardi."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Autorizzazione inviata"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" accetta questa richiesta conoscerai il suo stato."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Si sta partecipando ad una o più chat di gruppo"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9432,28 +9410,28 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Si è sicuri di voler uscire dalle stanze \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9462,16 +9440,16 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9479,11 +9457,11 @@ msgstr ""
 "Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "I trasporti verranno rimossi"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9492,58 +9470,69 @@ msgstr ""
 "Non si potranno inviare e ricevere messaggi verso i contatti di questi "
 "trasporti:%s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Stai per creare un metacontatto. Continuare?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Rinomina contatto"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Inserire un nuovo nickname per il contatto %s."
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Inserire un nome per il gruppo %s."
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Elimina Gruppo"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Rimuovere il gruppo %s dalla lista?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Elimina anche tutti i contatti di questo gruppo dalla lista"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9552,12 +9541,12 @@ msgstr ""
 "ti vedrà sempre offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Cosa fare?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9565,16 +9554,16 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Voglio che questo contatto conosca il mio stato dopo la rimozione"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Il contatto sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9583,20 +9572,33 @@ msgstr ""
 "Eliminando questi contatti:%s\n"
 "ne verrà rimossa anche l'autorizzazione. Ti vedranno sempre offline."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Stai per creare un metacontatto. Continuare?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "È necessario creare un account prima di poter chattare con altri contatti."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9605,12 +9607,12 @@ msgstr ""
 "Il tuo server non supporta il salvataggio di informazioni metacontatti. "
 "Perciò queste informazioni non saranno salvate al prossimo riavvio."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9620,24 +9622,24 @@ msgstr ""
 "Generalmente si usano quando la stessa persona ha più account jabber o su "
 "vari transport."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "File non valido"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vuoi inviare questo file a %s:"
 msgstr[1] "Vuoi inviare questi file a %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Invia %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Rendi %s e %s metacontatti"
@@ -9647,117 +9649,129 @@ msgstr "Rendi %s e %s metacontatti"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Gestione segnalibri..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "dell'account %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Pubblica"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Configura la _stanza..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Massimizza tutti"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Invia _messaggio di gruppo"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "A tutti gli utenti"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Utenti _online"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Vorrei aggiungerti ai miei contatti"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Gestisci contatti"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Modifica _gruppi"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Invia messaggio singolo"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Esegui comando..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Gestisci trasporto"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Modifica trasporto"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Rinomina"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Massimizza"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Nuova chat di gruppo"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Disconnetti"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Gestore cronologia"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
@@ -9774,21 +9788,21 @@ msgstr "Errore nella ricezione dei dati"
 msgid "No result"
 msgstr "Nessun risultato"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 #, fuzzy
 msgid "Disk WriteError"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Oggetto: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Conferma queste opzioni di sessione"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9803,7 +9817,7 @@ msgstr ""
 "\n"
 "\tQueste opzioni sono accettabili?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10003,6 +10017,137 @@ msgstr ""
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Crea _notifica speciale"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Assegna chiave Open_PGP"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Comandi: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Utilizzo: /%s, pulisce la finestra di testo."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Utilizzo: /%s, nasconde i pulsanti di chat."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Utilizzo: /%s <azione>, invia l'azione alla stanza corrente. Usare la "
+#~ "terza persona (esempio: /%s esplode)."
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Utilizzo: /%s, invia un ping al contatto"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Utilizzo: /%s, invia il messaggio al contatto"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Non esiste aiuto per /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Abilità la messaggistica zeroconf sulla rete locale"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Nickname non trovato: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Questa stanza non ha oggetto"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Nickname non trovato: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Utilizzo: /%s <nickname|JID> [motivo], bandisce il JID dalla stanza. Il "
+#~ "nickname di un partecipante può venire usato al posto del JID, ma non se "
+#~ "contiene \"@\". Se il JID è correntemente nella stanza, verrà anche "
+#~ "cacciato. NON supporta la presenza di spazi nel nickname."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Utilizzo: /%s <nickname>, apre una finestra di chat privata al "
+#~ "partecipante specificato."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Utilizzo: /%s [motivo], chiude la finestra oi scheda corrente, mostrando "
+#~ "il motivo se specificato."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Utilizzo: /%s <JID> [motivo], invita JID alla stanza corrente, "
+#~ "opzionalmente fornendo un motivo."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Utilizzo: /%s <stanza>@<server>[/nickname], offre la possibilità di "
+#~ "entrare in stanza@server, opzionalmente usando il nickname specificato."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Utilizzo: /%s <nickname> [motivo], rimuove il partecipante specificato "
+#~ "per nickname dalla stanza e opzionalmente mostra un motivo. NON supporta "
+#~ "la presenza di spazi nel nickname."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Utilizzo: /%s <nickname> [messaggio], apre una finestra di messaggi "
+#~ "privati ed invia il messaggio al partecipante specificato per nickname."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Utilizzo: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr ""
+#~ "Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
+#~ "corrente."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
+#~ "corrente."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Utilizzo: /%s <messaggio>, invia un messaggio senza considerare gli altri "
+#~ "comandi."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Utilizzo: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Clicca per vedere i servizi (come i trasporti MSN o ICQ) dei server Jabber"
diff --git a/po/lt.po b/po/lt.po
index 40b691a58..5b3ee1c1c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:55+0200\n"
 "Last-Translator: Mantas Zimnickas <sirexas@yahoo.com>\n"
 "Language-Team: Lithuanian <>\n"
@@ -219,6 +219,7 @@ msgstr "<b>Asmeninė informacija</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Prieiga"
 
@@ -285,8 +286,8 @@ msgstr "Keisti asmeninę informaciją..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -297,8 +298,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Bendros parinktys"
 
@@ -357,25 +358,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacija apie jus, kur yra išsaugota serveryje"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Raktas nepasirinktas"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Joks"
 
@@ -533,8 +530,8 @@ msgstr ""
 "Turėtumėte pakeisti leistinus ugniasienės nustatymus."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -548,7 +545,7 @@ msgid "Mer_ge accounts"
 msgstr "Apjun_gti prieigas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Pe_rvadinti"
 
@@ -811,7 +808,7 @@ msgid "All statuses"
 msgstr "Visos būklės"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Manęs nėra"
 
@@ -828,7 +825,7 @@ msgid "Have "
 msgstr "Turiu "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Nematomas"
 
@@ -837,7 +834,7 @@ msgid "Launch a command"
 msgstr "Paleisti komandą"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Esu išėjęs"
 
@@ -1029,7 +1026,7 @@ msgid "Join _Group Chat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "Įtr_aukti į kontaktų sąrašą"
@@ -1056,65 +1053,154 @@ msgstr "_Atverti nuorodą naršyklėje"
 msgid "_Start Chat"
 msgstr "_Pradėti pokalbį"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Pak_viesti į"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Observers"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Siųsti užklausimą, kad galėtumėte matyti jo/jos būklę"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Add Special _Notification"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Priskirti Open_PGP Raktą"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Vykdyti Komandą..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Redaguoti _Grupes"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "Pak_viesti į"
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Rename Contact"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Trinti"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Sends custom XML"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Siųsti ži_nutę..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "Siųsti _Failą"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Pradėti _Pokalbį"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Įjungti Open_PGP kodavimą"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Įjungti Open_PGP kodavimą"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "Įtr_aukti į kontaktų sąrašą"
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Leisti jam/jai matyti mano būklę"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Drausti jam/jai matyti mano būklę"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "_Istorija"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Pak_viesti į"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "Observers"
+msgid "_Manage Contact"
+msgstr "Rename Contact"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Pervadinti"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Sutikimas"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "nine"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Užpildykite formą."
@@ -1233,7 +1319,7 @@ msgstr ""
 "Asmens eilutė\n"
 "Pokalbio paveiksliukas"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Paryškintas"
 
@@ -1257,7 +1343,7 @@ msgstr "Dingo"
 msgid "Inactive"
 msgstr "Neaktyvus"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Pasviręs"
 
@@ -1335,6 +1421,14 @@ msgstr "Mo_deratorius"
 msgid "Occupant Actions"
 msgstr "_Valdytojo Veiksmai"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Siųsti _Failą"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "Įtr_aukti į kontaktų sąrašą"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Adminas"
@@ -1343,13 +1437,6 @@ msgstr "_Adminas"
 msgid "_Ban"
 msgstr "_Banas"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Išspirti"
@@ -1366,13 +1453,6 @@ msgstr "_Savininkas"
 msgid "_Send Private Message"
 msgstr "_Siųsti privačią žinutę"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Balsas"
@@ -1381,7 +1461,7 @@ msgstr "_Balsas"
 msgid "Create new post"
 msgstr "Kurti naują pranešimą"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Nuo"
 
@@ -1411,8 +1491,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim Istorijos Žurnalų Valdymas"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Trinti"
 
@@ -1458,34 +1538,38 @@ msgstr "Ieškoti"
 msgid "_Log conversation history"
 msgstr "_Registruoti pokalbio istoriją"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+msgid "Bookmark this room"
+msgstr ""
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Prisijungti prie šio kambario automatiškai."
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Slapyvardis:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Nesenai:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Kambarys:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Jungtis"
@@ -1514,7 +1598,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Rodyti būklę:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Serveris:"
 
@@ -2064,7 +2148,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "_Rūšiuoti kontaktus pagal būklę"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Būklė"
 
@@ -2237,34 +2321,39 @@ msgid "All"
 msgstr "Visi"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "visus pagal užsisakymą"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Leisti"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Atmesti"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Tvarka:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Privatus sąrašas"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "visus pagal užsisakymą"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "visus grupėje"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2276,19 +2365,19 @@ msgstr ""
 "nuo\n"
 "kam"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "žinučių siuntimui"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "užklausimų siuntimui"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "informavimui mane, apie būklę"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "mano būklės peržiūrai"
 
@@ -2480,105 +2569,11 @@ msgstr "Pašalinti prieigą ir iš Gajim ir iš _serverio"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Trinti"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Siųsti užklausimą, kad galėtumėte matyti jo/jos būklę"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Add Special _Notification"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Priskirti Open_PGP Raktą"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "Redaguoti _Grupes"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Vykdyti Komandą..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "Pak_viesti į"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Trinti"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Sends custom XML"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Siųsti ži_nutę..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "Siųsti _Failą"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Pradėti _Pokalbį"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Leisti jam/jai matyti mano būklę"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Drausti jam/jai matyti mano būklę"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "Rename Contact"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Pervadinti"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Sutikimas"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "nine"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2706,7 +2701,7 @@ msgid "_Add contact"
 msgstr "Įtraukti _Asmenį"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "Asmens Informacija"
@@ -2933,26 +2928,6 @@ msgstr "Ži_nutė"
 msgid "_Presence"
 msgstr "_Buvimas"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Add Special _Notification"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Priskirti Open_PGP Raktą"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Redaguoti _Grupes"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Pervadinti"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Keisti Prieigą..."
@@ -2997,48 +2972,48 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Activated"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Colour"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Value"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(None)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Hidden"
 
@@ -3052,253 +3027,252 @@ msgstr "Jūs gavote naują įrašą:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "British"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norwegian (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Serbian"
 msgstr "German"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Spelling language"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "A connection is not available"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Your message can not be sent until you are connected."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "nine"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Nick"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "Šri_ftas:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Asmens Informacija"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Encryption enabled"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Not in Roster"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Sąrašas aktyvių, baigtų ar sustabdytų failų siuntimų"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Encryption disabled"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Naudoti autentifikaciją"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Naudoti autentifikaciją"
@@ -3306,101 +3280,58 @@ msgstr "Naudoti autentifikaciją"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Commands: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Usage: /%s, clears the text window."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Usage: /%s, hide the chat buttons."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr ""
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Usage: /%s, hide the chat buttons."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "No help info for /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[This message is encrypted]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Encryption disabled"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[This message is encrypted]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[This message is encrypted]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3408,22 +3339,22 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
@@ -3432,23 +3363,23 @@ msgstr "%(nick)s is now %(status)s"
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is a file but it should be a directory"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is a directory but should be a file"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
@@ -3512,9 +3443,9 @@ msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Groupchats"
 
@@ -3532,71 +3463,112 @@ msgstr " %d unread message"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Use D-Bus and Notification-Daemon to show notifications"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Time in minutes, after which your status changes to away."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Away as a result of being idle"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Time in minutes, after which your status changes to not available."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Not available as a result of being idle"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Invalid username"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "status message text"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Invalid username"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Changing Nickname"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "status message text"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "Default"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Enable link-local/zeroconf messaging"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Language used by speller"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3606,7 +3578,7 @@ msgstr ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3616,17 +3588,17 @@ msgstr ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3636,7 +3608,7 @@ msgstr ""
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3644,7 +3616,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3652,7 +3624,7 @@ msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3662,19 +3634,19 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Add * and [n] in roster title?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3682,11 +3654,25 @@ msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "How many minutes should last lines from previous conversation last."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3694,11 +3680,11 @@ msgstr ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3707,11 +3693,11 @@ msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3723,13 +3709,13 @@ msgstr ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3737,7 +3723,7 @@ msgstr ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3745,11 +3731,11 @@ msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3757,7 +3743,7 @@ msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3765,13 +3751,13 @@ msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3780,27 +3766,27 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Notify of events in the system trayicon."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3808,17 +3794,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3826,13 +3812,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3840,7 +3826,7 @@ msgstr ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3848,11 +3834,11 @@ msgstr ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3860,7 +3846,7 @@ msgstr ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3868,7 +3854,7 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3882,29 +3868,29 @@ msgstr ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Background colour of contacts when they just signed in."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Background colour of contacts when they just signed out."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "If True, restored messages will use a smaller font than the default one."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3914,7 +3900,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3925,7 +3911,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3945,32 +3931,32 @@ msgstr ""
 "specific window. Note, changing this option requires restarting Gajim before "
 "the changes will take effect."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "If False, you will no longer see the avatar in the chat window."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Hides the buttons in group chat window."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Hides the banner in a group chat window"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Hides the banner in two persons chat window"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3978,27 +3964,27 @@ msgstr ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Išsiųsti žinutę ir uždaryti langą"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "List of colours that will be used to colour nicknames in group chats."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4006,7 +3992,25 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Should we show the confirm metacontacts creation dialogue or not? Empty "
+"string means we never show the dialogue."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Should we show the confirm metacontacts creation dialogue or not? Empty "
+"string means we never show the dialogue."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -4016,7 +4020,7 @@ msgstr ""
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4024,7 +4028,7 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4033,7 +4037,7 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4041,7 +4045,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4049,57 +4053,67 @@ msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4107,68 +4121,79 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "If False, you will no longer see the avatar in the chat window."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4176,125 +4201,125 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "all or space separated status"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', or 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' or ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4302,178 +4327,185 @@ msgstr ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Wrong host"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registration information for transport %s has not arrived in time"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Register to %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Connection Failed"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Extension not supported"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname not allowed: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "You are banned from this group chat."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Such group chat does not exist."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Your registered nickname must be used."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "You are not in the members list."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Authorisation has been removed"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we are now subscribed to %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we are now unsubscribed from %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4482,253 +4514,239 @@ msgstr ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passphrase was not given"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "You will be connected to %s without OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Invalid username"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %s answered wrongly to register request: %s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %s answered wrongly to register request: %s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Saved in: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Connection Failed"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4737,31 +4755,31 @@ msgstr ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "It is not possible to send empty files"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[This message is *encrypted* (See :JEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4770,30 +4788,40 @@ msgstr ""
 "Subject: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Rename Contact"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Connection Failed"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Observers"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transports"
 
@@ -4802,14 +4830,19 @@ msgid "Not in roster"
 msgstr "Not in roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus capabilities of Gajim cannot be used"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
@@ -4885,56 +4918,69 @@ msgid "eleven"
 msgstr "eleven"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s o'clock"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "five past %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "ten past %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "quarter past %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "twenty past %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "twenty five past %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "half past %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "twenty five to %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "twenty to %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "quarter to %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "ten to %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "five to %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s o'clock"
 
@@ -5002,224 +5048,224 @@ msgstr "Invalid character in hostname."
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Užimtas"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Užimtas"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Nepasiekiamas"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Laisvas Pokalbiams"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Laisvas Pokalbiams"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Prisijungęs"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Prisijungęs"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "_Nuėjęs"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "A_tsijungęs"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "N_ematomas"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Būklė nežinoma"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "Būklė klaidinga"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Joks"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Kam"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Abu"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Joks"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "is composing a message..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Siųsti žinutę"
 msgstr[1] "Siųsti žinutę"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5235,11 +5281,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -5962,13 +6008,13 @@ msgstr ""
 "cancelled."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5977,16 +6023,28 @@ msgstr ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP passphrase was not given"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "You will be connected to %s without OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "To continue sending and receiving messages, you will need to reconnect."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5995,32 +6053,32 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Please check if Avahi is installed."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -6029,21 +6087,21 @@ msgstr ""
 "sent."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[This message is encrypted]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6055,26 +6113,26 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Būklės žinutė, pagal nutylėjimą"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Įjungti"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6083,69 +6141,69 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is not usable in this computer"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6153,140 +6211,146 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "Prieigų valdymas"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "A Jabber ID must be in the form \"user@servername\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "There was a problem retrieving your OpenPGP secret keys."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "You must create your account before editing your personal information."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Without a connection, you can not edit your personal information."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "To change the account name, you must be disconnected."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Please rename or remove it before enabling link-local messaging."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6294,11 +6358,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6306,11 +6370,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6318,11 +6382,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6330,7 +6394,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6347,128 +6411,127 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Invalid username"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Nickname not allowed: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "Invalid username"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Invalid entry"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Please specify the new nickname you want to use:"
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contact already in roster"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6478,7 +6541,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6486,72 +6549,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Next Message Received"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Next Message Received"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6560,75 +6623,75 @@ msgstr ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Išjungti"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i days ago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber IM Klientas"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6663,21 +6726,21 @@ msgstr "Contact name"
 msgid "Set Mood"
 msgstr ""
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6685,105 +6748,105 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Please fill in the data of the contact you want to add in account %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "I would like to add you to my roster."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Last but not least, we would like to thank all the package maintainers."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6794,93 +6857,103 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Subscription request for account %s from %s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Invalid account name"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "You must create an account before you can chat with other contacts."
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Invalid username"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s is not the name of a group chat."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6889,303 +6962,303 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "New Message"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "I'm %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Norėšiau jus įtraukti į savo kontaktų sąrašą."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Adresas"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Keisti"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Group"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "I would like to add you to my roster."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Order: %s, action: %s, type: %s, value: %s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %s, action: %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "You must enter a name to create a privacy list."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "You have not joined a groupchat."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s wants to send you a file:"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7193,38 +7266,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7234,26 +7307,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7348,20 +7421,20 @@ msgstr "Description"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "You can manage your bookmarks via Actions menu in your roster."
 
@@ -7374,15 +7447,15 @@ msgstr "Subscribed"
 msgid "Node"
 msgstr "Joks"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
@@ -7824,31 +7897,31 @@ msgstr "Gajim needs X server to run. Quiting..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim needs PyGTK 2.6 or above"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim needs GTK 2.6 or above"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim needs GTK 2.6 or above to run. Quiting..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime is missing libglade support"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7857,21 +7930,21 @@ msgstr ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim needs PySQLite2 to run"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim needs pywin32 to run"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7881,11 +7954,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7893,34 +7966,34 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enter GPG key passphrase for account %s."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7930,165 +8003,171 @@ msgstr ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Authorisation for %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %s ( %s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Sutikimo užklausimas"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Unsubscribe"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s is now known as %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "A password is required to join this group chat."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Your passphrase is incorrect"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "Do _not ask me again"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8097,19 +8176,19 @@ msgstr ""
 "Gnomekeyring is installed but not correctly started (environment variable "
 "probably not correctly set)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "You have %d new mail conversation"
 msgstr[1] "You have %d new mail conversations"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8119,92 +8198,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Error reading file:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "You successfully received %(filename)s from %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "_Kiekvienai žinutei"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8212,15 +8291,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8231,12 +8310,12 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Prisijungimas"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
@@ -8244,51 +8323,51 @@ msgid ""
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Encryption disabled"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "You cannot join a group chat while you are invisible"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
@@ -8322,12 +8401,13 @@ msgstr ""
 "separate line"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "account"
 
@@ -8352,9 +8432,9 @@ msgstr "status"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "message"
 
@@ -8371,22 +8451,46 @@ msgstr ""
 "of all accounts that have \"sync with global status\" option set"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Changes the status of account or accounts"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "_Prioritetas:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Noriu už_registruoti naują prieigą"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Shows the chat dialogue so that you can send messages to a contact"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID of the contact that you want to chat with"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8396,29 +8500,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "message contents"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp key"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8428,135 +8532,135 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Adds new contact to this account"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8564,77 +8668,77 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "message contents"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Kambarys:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Nickname not found: %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Passwords do not match"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8643,31 +8747,31 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8676,7 +8780,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8685,7 +8789,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8694,7 +8798,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Wrong uri"
 
@@ -8724,313 +8828,175 @@ msgstr "You cannot delete your current theme"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%s\" or \"%s\" has left."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Pokalbio istorija"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Prisijungimas"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Your new account has been successfully created"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Affiliation:"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Nickname not found: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "This group chat has no subject"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Invited %(contact_jid)s to %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Nickname not found: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked. Does "
-"NOT support spaces in nickname."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason. Does NOT support "
-"spaces in nickname."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Usage: /%s , display the names of group chat occupants."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Usage: /%s [topic], displays or updates the current group chat topic."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "If you close this window, you will be disconnected from this group chat."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Please specify the new nickname you want to use:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Description: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
@@ -9102,6 +9068,15 @@ msgstr "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "New Group Chat"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "I would like to add you to my roster"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
@@ -9184,53 +9159,62 @@ msgstr "Conversation History with %s"
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is now %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Error message: %s"
+
+#: ../src/history_window.py:440
+msgid "Error"
+msgstr ""
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is now: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Could not load image"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "You are not connected to the server"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Do you really want to delete the selected message?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Messages"
 
@@ -9291,12 +9275,12 @@ msgstr "nine"
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "File path"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "Such group chat does not exist."
@@ -9304,7 +9288,7 @@ msgstr "Such group chat does not exist."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Could not load image"
 
@@ -9336,46 +9320,46 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Apjungtos prieigos"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Dabar \"%s\" žinos apie jūsų būklę."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9383,28 +9367,28 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9413,16 +9397,16 @@ msgstr ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9430,11 +9414,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9443,58 +9427,70 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports:%s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Do you want to remove group %s from the roster?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove also all contacts in this group from your roster"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9503,12 +9499,12 @@ msgstr ""
 "her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "What do you want to do?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9516,16 +9512,16 @@ msgstr ""
 "By removing this contact you also by default remove authorisation resulting "
 "in him or her always seeing you as offline."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "I want this contact to know my status after removal"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9534,19 +9530,33 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "You must create an account before you can chat with other contacts."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9555,13 +9565,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9571,24 +9581,24 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Invalid File"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s wants to send you a file:"
 msgstr[1] "%s wants to send you a file:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Send %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Make %s and %s metacontacts"
@@ -9598,123 +9608,134 @@ msgstr "Make %s and %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "using account %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Manage Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "for account %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Keisti Būklės Žinutę"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publish"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Keisti kambario nustatymus"
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Visiems"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Visiems prisijungusiems"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "I would like to add you to my roster"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Rename Contact"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Redaguoti _Grupes"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Siųsti vieną žinutę"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Vykdyti Komandą..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transports"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Rodyti _Pernašas"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Pervadinti"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "Contact Disconnected"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "New Group Chat"
+msgid "_Disconnect"
+msgstr "Contact Disconnected"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
@@ -9731,20 +9752,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9754,7 +9775,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9949,6 +9970,129 @@ msgstr ""
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Add Special _Notification"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Priskirti Open_PGP Raktą"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Commands: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Usage: /%s, clears the text window."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Usage: /%s, hide the chat buttons."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Usage: /%s, hide the chat buttons."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "No help info for /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Enable link-local/zeroconf messaging"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Nickname not found: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "This group chat has no subject"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Invited %(contact_jid)s to %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Nickname not found: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked. "
+#~ "Does NOT support spaces in nickname."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason. Does NOT "
+#~ "support spaces in nickname."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Usage: /%s , display the names of group chat occupants."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr "Jabber serverių paslaugų sąrašas (tokių, kaip: MSN, ICQ pernašos)"
 
diff --git a/po/nb.po b/po/nb.po
index 6a86433c9..af4dea71f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:56+0200\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team:  <>\n"
@@ -212,6 +212,7 @@ msgstr "<b>Personlig Informasjon</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Konto"
 
@@ -278,8 +279,8 @@ msgstr "Rediger Personlig Informasjon..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -290,8 +291,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Generelle"
 
@@ -350,25 +351,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ingen"
 
@@ -525,8 +522,8 @@ msgstr ""
 "Du kan også vurdere å endre mulige brannmur innstillinger."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -540,7 +537,7 @@ msgid "Mer_ge accounts"
 msgstr "Sammenslåin_g av kontoer"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
@@ -801,7 +798,7 @@ msgid "All statuses"
 msgstr "Alle statuser"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Borte"
 
@@ -818,7 +815,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -827,7 +824,7 @@ msgid "Launch a command"
 msgstr "Kjør en kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
@@ -1013,7 +1010,7 @@ msgid "Join _Group Chat"
 msgstr "Bli med i _Gruppe Samtale"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Legg til Kontaktliste..."
 
@@ -1039,39 +1036,6 @@ msgstr "_Åpne Link i Nettleser"
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Inviter _Kontakter"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Send _Fil"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Endre Ende til Ende Kryptering"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Endre Open_PGP Kryptering"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Legg til Kontaktliste"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Historie"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "In_viter"
@@ -1096,6 +1060,119 @@ msgstr ""
 "Du kommer nå til å starte en Fler-Bruker Samtale.\n"
 "Velg kontaktene du ønsker å invitere"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "F_orespør å se hans/hennes status"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Legg til Spesielt _Varsel"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Tilegn Open_PGP Nøkkel..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Kjør Kommando..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Rediger _Grupper..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "In_viter til"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Inviter _Kontakter"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "_Fjern"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Send Egendefiner_t Status"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Send Enkel _Melding..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Send _Fil..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Velg Egendefinert _Avatar..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Start _Samtale"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Endre Ende til Ende Kryptering"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Endre Open_PGP Kryptering"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Tillat han/henne å se min status"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Blokker"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Forby han/henne å se min status"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Historie"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignorer"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Behandle Kontakt"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Gi nytt navn..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Abonnement"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Frigi"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Ikke ignorer"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Fyll inn skjemaet."
@@ -1212,7 +1289,7 @@ msgstr ""
 "Kontakt rad\n"
 "Samtale Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Fet"
 
@@ -1236,7 +1313,7 @@ msgstr "Borte"
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1308,6 +1385,14 @@ msgstr "M_odererer"
 msgid "Occupant Actions"
 msgstr "Beboer Handlinger"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Send _Fil"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Legg til Kontaktliste"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1316,13 +1401,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Blokker"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Kast ut"
@@ -1339,13 +1417,6 @@ msgstr "_Eier"
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Frigi"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Stemme"
@@ -1354,7 +1425,7 @@ msgstr "_Stemme"
 msgid "Create new post"
 msgstr "Lag en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Fra"
 
@@ -1378,8 +1449,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Historikk og Logg Behandler</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Slett"
 
@@ -1432,34 +1503,39 @@ msgstr "Søk:"
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "_Bokmerke dette rommet (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Gå inn i dette rommet automatisk ved tilkobling"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Nylig:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Bli med"
@@ -1488,7 +1564,7 @@ msgstr "Minimer ved Automatisk Deltakelse"
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2023,7 +2099,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2190,34 +2266,39 @@ msgid "All"
 msgstr "Alle"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "alle etter abonnement"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Tillate"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Nekt"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "alle etter abonnement"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "alle i gruppen"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2229,19 +2310,19 @@ msgstr ""
 "fra\n"
 "til"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "å sende meg meldinger"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "å sende meg forespørsler"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "å sende meg status"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "å se min status"
 
@@ -2409,96 +2490,11 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "F_orespør å se hans/hennes status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Legg til Spesielt _Varsel"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Tilegn Open_PGP Nøkkel..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Rediger _Grupper..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Kjør Kommando..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "In_viter til"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "_Fjern"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Send Egendefiner_t Status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Send Enkel _Melding..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Send _Fil..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Velg Egendefinert _Avatar..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Start _Samtale"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Tillat han/henne å se min status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Forby han/henne å se min status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignorer"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Behandle Kontakt"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Gi nytt navn..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Abonnement"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Ikke ignorer"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2620,7 +2616,7 @@ msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Informasjon"
 
@@ -2835,26 +2831,6 @@ msgstr "_Melding"
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Legg til Spesiell _Alarm"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Tilegn Open_PGP Nøkkel"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Rediger _Grupper"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Gi Nytt Navn"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
@@ -2898,48 +2874,48 @@ msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Aktivert"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Deaktivert"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Nummer"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Farge"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Skrive"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Gjemt"
 
@@ -2953,189 +2929,188 @@ msgstr "Du har mottatt en ny inntreden:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretagner"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Brtisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norsk (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Udefinert"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Syk"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Font:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktinformasjon"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Dersom du sender en fil til %s, vil han/henne kjenne din ekte Jabber ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering påslått"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "ikke i kontaktliste"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "En liste over aktive, komplette og stoppede fil overføringer"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Ukjent Artist"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Ukjent Tittel"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Ukjent Kilde"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3144,17 +3119,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
 "fra  <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3162,50 +3137,50 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "og IKKE autentisert"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3214,66 +3189,23 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Kommando ikke støttet for zeroconf konto."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Kommandoer: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Bruk: /%s, gjemmer samtale knappene."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Bruk: /%(command)s <action>, sender handling til gjeldende rom. Bruk tredje "
-"person. (f.eks.  /%(command)s eksploderer.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Bruk: /%s, sender en ping til kontakten"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Bruk: /%s, sender meldingen til kontakten"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Ingen hjelpe informasjon for /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3281,25 +3213,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Den følgende meldingen ble kryptert"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3307,15 +3239,15 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Database feil"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3324,7 +3256,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
@@ -3333,23 +3265,23 @@ msgstr "%(name)s er nå %(status)s"
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s er en fil men skulle ha vært en katalog"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er en katalog men skulle vært en fil"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
@@ -3413,9 +3345,9 @@ msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
@@ -3431,70 +3363,111 @@ msgstr "Videresend uleste meldinger"
 msgid "All unread messages have been forwarded."
 msgstr "Alle uleste meldinger har blitt videresendt."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før status endres til borte."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Borte på grunn av inaktivitet i mer enn $T min)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S vil bli byttet ut med gjeldende status melding, $T av automatisk borte "
 "tid. "
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før status endres til ikke tilgjengelig."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Ikke tilgjengelig på grunn av inaktivitet i mer enn $T min)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S vil bli byttet ut med gjeldende status melding, $T av auoxa tid."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Ugyldig kallenavn"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "status melding tekst"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Ugyldig kallenavn"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Endrer Kallenavn"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "status melding tekst"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "standard"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Slå på link-lokal/zeroconf meldinger"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Språk som brukes av ordlisten"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3504,7 +3477,7 @@ msgstr ""
 "'sometimes' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
 "'never' - aldri vis klokkeslett."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3514,18 +3487,18 @@ msgstr ""
 "4, eller 0 for å deaktivere fuzzyclock. 1 er den mest presise klokken, 4 er "
 "den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings symboler."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
 "fjernet."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3536,7 +3509,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (Dersom du ønsker å bruke dette, må du "
 "installere docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3544,7 +3517,7 @@ msgstr ""
 "Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i "
 "gruppesamtaler."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3552,7 +3525,7 @@ msgstr ""
 "Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er "
 "opptatt av noen andre i samtalegruppen."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3563,19 +3536,19 @@ msgstr ""
 "strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-"
 "time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tegn som skrives før kallenavnet i samtaler"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3583,12 +3556,26 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3596,11 +3583,11 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3609,11 +3596,11 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3625,12 +3612,12 @@ msgstr ""
 "at de synkroniserer med global status) basert på statusen til nettverks "
 "tilkoblingen."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3638,7 +3625,7 @@ msgstr ""
 "Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
 "avslått."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3646,11 +3633,11 @@ msgstr ""
 "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
 "det hvert x minutt."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3658,7 +3645,7 @@ msgstr ""
 "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3666,13 +3653,13 @@ msgstr ""
 "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3681,27 +3668,27 @@ msgstr ""
 "grensesnitt, for Fil Overføring i tilfelle adresse oversetting/port "
 "videresending."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Varsle om hendelser i system-statusfelt ikonet."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis notatblokk faner i samtalevinduer?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3712,16 +3699,16 @@ msgstr ""
 "separert med komma. Gyldige grupper er 1, 2, 5, 14, 15, 16, 17 og 18. Høyere "
 "nummer er mer sikre men tar lenger å kalkulere når du starter en sesjon. "
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvik nye meldinger i popup vindu?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3729,14 +3716,14 @@ msgstr ""
 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
 "på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Dersom True vil Gajim sjekke om den er standard jabber klient ved hver "
 "oppstart."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3744,7 +3731,7 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3752,12 +3739,12 @@ msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definer posisjo for avatar i kontaktlisten. Kan være venste eller høyre"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3765,7 +3752,7 @@ msgstr ""
 "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke hadde "
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3773,7 +3760,7 @@ msgstr ""
 "Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3786,29 +3773,29 @@ msgstr ""
 "hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
 "Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget ut."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis kontaktbilde for transporten selv."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3818,7 +3805,7 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3829,7 +3816,7 @@ msgstr ""
 "til gruppesamtaler"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3850,31 +3837,31 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Dersom True vil man kunne lukke fane/vindu med escape knappen."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Gjemmer knappene i samtale vinduer."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3882,15 +3869,15 @@ msgstr ""
 "I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den "
 "samme person som snakker som i den forrige meldingen."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Jevn tekstrulling av meldinger i samtale vinduene"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3898,11 +3885,11 @@ msgstr ""
 "Liste av farger, separert av \":\", som vil bli brukt til å farge kallenavn "
 "i gruppesamtaler."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab går til neste skrivefane når ingenting er ulest."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3910,7 +3897,25 @@ msgstr ""
 "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
 "innhold mener at vi aldri viser dialogen."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
+"innhold mener at vi aldri viser dialogen."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
+"innhold mener at vi aldri viser dialogen."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3920,7 +3925,7 @@ msgstr ""
 "kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
 "prioritet vil du ikke motta noen meldinger fra din server."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3928,7 +3933,7 @@ msgstr ""
 "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
 "konto passord."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3937,7 +3942,7 @@ msgstr ""
 "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
 "konto passord."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3945,7 +3950,7 @@ msgstr ""
 "Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
 "og gruppe rader. "
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3953,7 +3958,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Dersom ikke tom, behandle alle "
 "innkommende meldinger som om de var av denne typen."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3961,7 +3966,7 @@ msgstr ""
 "Dersom Sant vil Gajim skrolle og velge kontakten som sendte deg siste "
 "melding, om ikke samtalevinduet allerede er åpnet. "
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3969,18 +3974,18 @@ msgstr ""
 "Dersom Sant vil Gajim konvertere mellom $$ og $$ til et bilde med dvips og "
 "konvertere før innsetting i et samtale vindu."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tif med inaktivitet som behøves før endre status vinduet lukkes."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3988,11 +3993,11 @@ msgstr ""
 "Dersom Sant vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Velg intervall mellom 2 punkter av ledighet."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4000,7 +4005,7 @@ msgstr ""
 "Endre verdien for å endre størrelsen på lateks formlene som vises. Høyrere "
 "er større."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4009,13 +4014,23 @@ msgstr ""
 "Lovlige uri skjema. Bare skjema i denne listen vil bli aksepterte som en "
 "\"ekte\" uri."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4023,7 +4038,7 @@ msgstr ""
 "Prioritet vil endre automatisk i følge med din status. Prioritetene "
 "defineres i autopriority_* valgene."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4032,26 +4047,37 @@ msgstr ""
 "borte, xa, ikke forstyrr, usynlig. MERK: dette valget brukes bare dersom "
 "restore_last_status er deaktivert"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Dersom valgt, gjenopprett siste status brukt."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Dersom deaktivert, ikke signer tilstedeværelser med GPG nøkkel, selv om GPG "
 "er konfigurert."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne kontoen."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en kryptert sesjon når mulig?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4059,29 +4085,29 @@ msgstr ""
 "Ordnet liste (mellomrom separert) av tilkoblingstyper som skal prøves. Kan "
 "inneholde tls, ssl eller plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Vis en advarsels dialog før bruk av standard SSL bibliotek."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4091,11 +4117,11 @@ msgstr ""
 "på nytt."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4103,15 +4129,15 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4119,11 +4145,11 @@ msgstr ""
 "Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
 "meldinger skal logges?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4131,101 +4157,101 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "alle eller mellomroms separert status"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' eller ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4234,99 +4260,99 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Feil maskinnavn"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Ugyldig lokal adresse? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard publisering vellykket"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4335,77 +4361,84 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den (se http://trac.gajim."
 "org/wiki/DatabaseBackup) eller fjern den (all historikk vil bli borte)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kallenavn ikke lovlig: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Rommet har blitt ødelagt"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan bli med i dette rommet isteden: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nå på %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abonnerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4415,220 +4448,206 @@ msgstr ""
 "kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å "
 "fjerne den"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passordsetning ble ikke gitt"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til å få utsteders sertifikat"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til å skaffe sertifikatets CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til å dekryptere sertifikatets signatur"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til å dekryptere CRLens signatur"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Klarer ikke å dekode usteders offentlige nøkkel"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Sertifikat signatur feil"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "CRL signatur feil"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Sertifikatet er ikke gylig enda"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Sertifikatet har utløpt"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL er ikke gyldig enda"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL har utgått"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Formaterings feil i sertifkatets notBefore felt"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Formaterings feil i sertifikatets notAfter felt"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formaterings feil i CRLens lastUpdate felt"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formaterings feil i CRLens nextUpdate felt"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Tom for minne"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Selvsignert sertifikat"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsignert sertifikat i sertifikats kjeden"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Ute av stand til å få tak i lokal utsteders sertifikat"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Ute av stand til å verifisere det første sertifikatet"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Sertifikats kjeden er for lang"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Sertifikat tilbakekallt"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA sertifikat"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Stilengde begrensning overskredet"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Ikke støttet sertifkats hensikt"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Sertifikatet er ikke tiltrodd"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Sertifikatet avvist"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Tittel utsteder passer ikke"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og tittel nøkkel identifikator passer ikke"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og utsteder seriernummer passer ikke"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Tilkobling til konto %s har blitt mistet. Prøv igjen."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4637,7 +4656,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4646,24 +4665,24 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4672,18 +4691,18 @@ msgstr ""
 "Privatlivs listen %s har ikke blitt fjernet. Den er kanskje aktiv i en av "
 "dine tilkoblede ressurser. Deaktiver den og prøv igjen."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Enten er ikke en nøkkel tildelt ellers har ikke kontakten signert."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4691,12 +4710,12 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4705,30 +4724,40 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Inviter _Kontakter"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "vCard publisering feilet"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Observerere"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transporter"
 
@@ -4737,14 +4766,19 @@ msgid "Not in roster"
 msgstr "ikke i kontaktliste"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne maskinen"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
@@ -4821,56 +4855,69 @@ msgid "eleven"
 msgstr "elleve"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "klokken %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "fem over %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "ti over %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "kvart over %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "twenty past %(0)s"
 msgstr "ti på halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "twenty five past %(0)s"
 msgstr "fem på halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, fuzzy, python-format
 msgid "half past %(0)s"
 msgstr "halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "fem over halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "ti over halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "kvart på %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "ti på %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "fem på %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s"
 
@@ -4938,224 +4985,224 @@ msgstr "Ugyldig karakter i domene navn."
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Ordstyrere"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Ordstyrer"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "skriver en melding..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d melding venter"
 msgstr[1] "%d meldinger venter"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr "fra rom %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr "fra bruker %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr "fra %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hendelse venter"
 msgstr[1] "%d hendelser venter"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Feil i eksekvering av \"%(command)s\": %(error)s"
@@ -5171,11 +5218,11 @@ msgstr "%s er ikke et gyldig loggnivå"
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
@@ -5827,7 +5874,7 @@ msgstr ""
 "avbrutt."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5835,7 +5882,7 @@ msgstr ""
 "[Dette er en del av en kryptert sesjon. Dersom du ser denne meldingen gikk "
 "noe galt.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5844,15 +5891,27 @@ msgstr ""
 "Verten %s du konfigurerte har ft_add_hosts_to_send i avanserte valg og er "
 "ikke gyldig, så den ignoreres."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP passordsetning ble ikke gitt"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "For å sende og motta meldinger må du koble til på nytt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahi feil"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5861,31 +5920,31 @@ msgstr ""
 "%s\n"
 "Link-lokal meldinger fungerer muligens ikke riktig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Vennligst sjekk om Avahi eller Bonjour er installert."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Klarer ikke å lytte til port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5894,20 +5953,20 @@ msgstr ""
 "sendes."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5920,24 +5979,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Feil ved tilføying av tjeneste. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Standard Melding"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5946,70 +6005,70 @@ msgstr ""
 "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
 "språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "status melding tekst"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6017,139 +6076,145 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "For å endre konto navnet må du ikke være tilkoblet."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6157,11 +6222,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6169,11 +6234,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6181,11 +6246,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6193,7 +6258,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6210,124 +6275,123 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Kallenavn ikke lovlig: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, "
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dette sertifikatet er allerede i filen %s, så det legges ikke til igjen."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6342,7 +6406,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6353,63 +6417,63 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt i Fokus"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Neste Melding Motatt ikke i Fokus"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6419,7 +6483,7 @@ msgstr ""
 "har blitt motatt av andre enden. Dersom dette ikonet\n"
 "vises lenge er det sannsynlig at meldingen ble mistet."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6427,74 +6491,74 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt\n"
 "siden sist du fulgte med i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Avslutt"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Jabber ID allerede i listen"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber IDen du skrev inn er allerede i lsiten. Vennligst velg en ny. "
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
@@ -6529,125 +6593,125 @@ msgstr "Kontakt navn"
 msgid "Set Mood"
 msgstr "Sett Stemning"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Melding?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Dette navnet er allerede i bruk. Ønsker du å overskrive denne status "
 "meldingen?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Sist men ikke minst ønsker vi å takke alle de som lager installasjonspakker."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6660,88 +6724,98 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings forespørsel for konto %(account)s fra %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Ugyldig konto navn"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan ikke synkronisere med en konto uten å være tilkoblet."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6750,301 +6824,301 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Skjema %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Konsoll"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr "Adresse"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Humørsyk"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Gruppe"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rekkefølge:  %(order)s, handling: %(action)s, type: %(type)s, verdi: %(value)"
 "s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må skrive et navn for å lage en liste over uønskede."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har invitert deg til gruppesamtalen %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7055,19 +7129,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7077,19 +7151,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7104,23 +7178,23 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøkkel (%s) <b>passer ikke</b> med nøkkelen tildelt i Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
 "meldinger."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7129,7 +7203,7 @@ msgstr ""
 "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG klient "
 "for å stole på denne nøkkelen."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7224,20 +7298,20 @@ msgstr "Beskrivelse"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
 
@@ -7249,15 +7323,15 @@ msgstr "Abonnerte"
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
@@ -7713,31 +7787,31 @@ msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim trenger PyGTK 2.8 eller høyere"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim tenger PyGTK 2.8 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim trenger GTK 2.8 eller høyere"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim trenger GTK 2.8 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7746,20 +7820,20 @@ msgstr ""
 "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
 "versjon fra %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7769,11 +7843,11 @@ msgstr ""
 "på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7781,35 +7855,35 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7820,59 +7894,59 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Feil %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Abonnerings Forespørsel"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7880,77 +7954,77 @@ msgstr ""
 "Du vil alltid se han eller henne som frakoblet.\n"
 "Ønsker du å fjerne han eller henne fra din kontakt liste?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Fjern Abonnement"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nå kjent som %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har satt tittel til %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Rommet viser nå utilgjengelig medlem"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "rommet viser nå ikke utilgjengelige medlemmer"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "En non-privacy-related rom konfigurasjons ending har skjedd"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Rom logging er nå påslått"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Rom logging er nå avslått"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymisert"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymisert"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Romet er nå full-anonymisert"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Et passord kreves for å bli med i rommet %s. Vennligst skriv det."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7958,20 +8032,25 @@ msgstr ""
 "Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
 "som kjører eller den returnerte feil passord frase.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Passord setningen din er ikke riktig"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG fungerer ikke"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7980,13 +8059,14 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
 "meldinger."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7995,19 +8075,19 @@ msgstr ""
 "Gnome Keyring er installert men ikke \t\t\t\t\t\t\tstartet riktig (system "
 "variabel sikkert ikke \t\t\t\t\t\t\tsatt riktig)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Du har %d ny e-post samtale"
 msgstr[1] "Du har %d nye e-post samtaler"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8022,44 +8102,44 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8068,36 +8148,36 @@ msgstr ""
 "Ikke mulig å dekryptere melding fra %s\n"
 "Den kan ha blitt endret."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Feil."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8105,11 +8185,11 @@ msgstr ""
 "Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
 "et annet"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8120,15 +8200,15 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8145,11 +8225,11 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8157,11 +8237,11 @@ msgstr ""
 "Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
 "at du ønsker å gjøre det?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg ønsker å koble til usikkert"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8170,21 +8250,21 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "PEP noden ble ikke fjernet"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8192,7 +8272,7 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8202,13 +8282,13 @@ msgstr ""
 "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
@@ -8242,12 +8322,13 @@ msgstr ""
 "en egen linje"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "konto"
 
@@ -8274,9 +8355,9 @@ msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "melding"
 
@@ -8293,22 +8374,46 @@ msgstr ""
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Endrer status på konto eller kontoer"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priorit_et:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Jeg ønsker å _registrere en ny konto"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
+"til alle kontoer som har \"synkroniser med global status\" valget påslått"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8318,30 +8423,30 @@ msgstr ""
 "nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8351,137 +8456,137 @@ msgstr ""
 "nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sender nye meldinger to en gruppesamtale som du er tilkoblet."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID til rommet som vil motta meldingen"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på innstillingen, 'verdi' er gjeldende innstilling"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Legger til en ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer innstillinger (globale innstillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerer gjeldende status melding (den globale om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åpner 'Start Samtale' dialogen"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Starter samtale, med denne kontoen"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8489,72 +8594,72 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI til håndgrep"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Konto som du ønsker å benytte for å håndtere det"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "rom"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "passord"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8563,15 +8668,15 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ut som Gajim ikke kjører, så du kan ikke bruke gajim-remote. "
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8580,16 +8685,16 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8598,7 +8703,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8607,7 +8712,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8616,7 +8721,7 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Feil uri"
 
@@ -8645,296 +8750,152 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke lenger i samtalerommet \"%(room)s\" eller \"%(nick)s\" har dratt."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har satt eller endret ditt rom kallenavn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilknytning for %(nick)s har blitt satt til %(affiliation)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilknutning for %(nick)s har blitt satt til %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Kallenavn ikke funnet: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Dette gruppesamtalerommet har ikke tittel"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Invitert %(contact_jid)s til %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Kallenavn ikke funnet: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra "
-"samtalerommet. Kallenavnet til en bruker kan bli brukt, men ikke dersom det "
-"inneholder \"@\". Skulle en bruker med den JIDen være tilstede i rommet vil "
-"denne også bli kastet ut. Det støttes ikke med mellomrom i kallenavnet."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
-"spesifiserte brukeren."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
-"dersom spesifisert."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser "
-"en grunn dersom spesifisert."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
-"gir mulighet for å spesifisere valgfritt kallenavn."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av "
-"kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke "
-"mellomrom i kallenavn."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og "
-"sender meldingen til brukeren spesifisert av kallenavn."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
-"samtalerom."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
-"kommandoer."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
-"samtalerom."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av samtalerommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Dersom du lukker dette vinduet, så vil du bli koblet fra dette samtalerommet."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8942,22 +8903,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -9029,6 +8990,14 @@ msgstr "Bilde kan ikke lagres i %(type)s format. Lagre som %(new_filename)s?"
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Ny Gruppe Samtale"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Jeg ønsker å legge deg til min kontaktliste"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
@@ -9109,52 +9078,62 @@ msgstr "Samtale Historikk med %s"
 msgid "Disk Error"
 msgstr "Disk Feil"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Feil melding: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Feil."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ønsker du virkelig å slette den valgte meldingen?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -9215,18 +9194,18 @@ msgstr "_Ignorer"
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
@@ -9258,48 +9237,48 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9307,28 +9286,28 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9336,16 +9315,16 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått og kontakten er i kontaktlisten."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9353,11 +9332,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9366,57 +9345,69 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ønsker du å fjerne gruppen %s fra kontaktlisten?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Også fjerne alle kontakter i denne gruppen fra kontaktlisten"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9425,11 +9416,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9437,16 +9428,16 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9456,19 +9447,33 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du må lage en konto før du kan snakke med andre kontakter."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9476,13 +9481,13 @@ msgstr ""
 "Din server støtter ikke lagring av metakontakt informasjon, så denne "
 "informasjonen vil ikke bli lagret til neste tilkobling."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9492,23 +9497,23 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Ønsker du å sende denne filen til %s:"
 msgstr[1] "Ønsker du å sende disse filene til %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Send %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
@@ -9518,115 +9523,127 @@ msgstr "Gjør %s og %s metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Jeg ønsker å legge deg til min kontaktliste"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Rediger _Grupper"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Kjør Kommando..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Gi Nytt Navn"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Koble ifra"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Ny Gruppe Samtale"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Koble ifra"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
@@ -9643,20 +9660,20 @@ msgstr "Feil i motatt dataskjema"
 msgid "No result"
 msgstr "Ingen resultater"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Disk SkriveFeil"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Tittel: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9671,7 +9688,7 @@ msgstr ""
 "\n"
 "\tEr disse valgene akseptable?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9867,6 +9884,139 @@ msgstr "Det er ingen ventende abonnements forespørsler."
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Legg til Spesiell _Alarm"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Tilegn Open_PGP Nøkkel"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Kommando ikke støttet for zeroconf konto."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Kommandoer: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Bruk: /%s, gjemmer samtale knappene."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Bruk: /%(command)s <action>, sender handling til gjeldende rom. Bruk "
+#~ "tredje person. (f.eks.  /%(command)s eksploderer.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Bruk: /%s, sender en ping til kontakten"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Bruk: /%s, sender meldingen til kontakten"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Ingen hjelpe informasjon for /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Slå på link-lokal/zeroconf meldinger"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Kallenavn ikke funnet: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Dette gruppesamtalerommet har ikke tittel"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Invitert %(contact_jid)s til %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Kallenavn ikke funnet: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra "
+#~ "samtalerommet. Kallenavnet til en bruker kan bli brukt, men ikke dersom "
+#~ "det inneholder \"@\". Skulle en bruker med den JIDen være tilstede i "
+#~ "rommet vil denne også bli kastet ut. Det støttes ikke med mellomrom i "
+#~ "kallenavnet."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
+#~ "spesifiserte brukeren."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser "
+#~ "årsak dersom spesifisert."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og "
+#~ "viser en grunn dersom spesifisert."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server "
+#~ "og gir mulighet for å spesifisere valgfritt kallenavn."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av "
+#~ "kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke "
+#~ "mellomrom i kallenavn."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu "
+#~ "og sender meldingen til brukeren spesifisert av kallenavn."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
+#~ "samtalerom."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
+#~ "kommandoer."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
+#~ "samtalerom."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
diff --git a/po/nl.po b/po/nl.po
index 0d088e017..dc9605ed2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2005-12-19 18:44+0100\n"
 "Last-Translator: Stéphan Kochen <stephan@kochen.nl>\n"
 "Language-Team: none\n"
@@ -225,6 +225,7 @@ msgstr "<b>Persoonlijke Informatie</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Account"
 
@@ -292,8 +293,8 @@ msgstr "Wijzig Persoonlijke Informatie..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -304,8 +305,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Algemeen"
 
@@ -364,25 +365,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informatie over jou, zoals op de server opgeslagen"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Geen"
 
@@ -540,8 +537,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -557,7 +554,7 @@ msgid "Mer_ge accounts"
 msgstr "Accounts _samenvoegen"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Her_noem"
 
@@ -830,7 +827,7 @@ msgid "All statuses"
 msgstr "Status: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Afwezig"
 
@@ -848,7 +845,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
@@ -858,7 +855,7 @@ msgid "Launch a command"
 msgstr "commando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Niet Beschikbaar"
 
@@ -1052,7 +1049,7 @@ msgid "Join _Group Chat"
 msgstr "Neem deel aan _Groepsgesprek"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "_Toevoegen aan Roster"
@@ -1079,65 +1076,158 @@ msgstr "_Open Link in Browser"
 msgid "_Start Chat"
 msgstr "_Start Gesprek"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Onzichtbaar"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Server"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+#, fuzzy
+msgid "A_sk to see his/her status"
+msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "<b>Visuele Meldingen</b>"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Wijs Open_PGP Sleutel toe"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "commando"
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Wijzig _Groepen"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "_Inhoud"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Verwijder"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send Single _Message..."
+msgstr "Enkel _Bericht Verzenden"
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "_Bestand Verzenden"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Start _Gesprek"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Schakel Open_PGP Codering om"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Schakel Open_PGP Codering om"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Toevoegen aan Roster"
+#: ../data/glade/contact_context_menu.glade.h:17
+#, fuzzy
+msgid "_Allow him/her to see my status"
+msgstr "Sta hem/haar toe mijn status te zien"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:19
+#, fuzzy
+msgid "_Forbid him/her to see my status"
+msgstr "Verbiedt hem/haar mijn status te zien"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Onzichtbaar"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "Server"
+msgid "_Manage Contact"
+msgstr "_Inhoud"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Hernoem"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Abonnement"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "_Verder"
+
 #: ../data/glade/data_form_window.glade.h:1
 #, fuzzy
 msgid "Fill in the form."
@@ -1264,7 +1354,7 @@ msgstr ""
 "Contact\n"
 "Vaandel"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Vetgedrukt"
 
@@ -1290,7 +1380,7 @@ msgstr "Geen"
 msgid "Inactive"
 msgstr "Actief"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Schuingedrukt"
 
@@ -1365,6 +1455,14 @@ msgstr "_Beheerder"
 msgid "Occupant Actions"
 msgstr "_Gebruiker Acties"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "_Bestand Verzenden"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Toevoegen aan Roster"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1373,13 +1471,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "Uit_schoppen"
@@ -1396,13 +1487,6 @@ msgstr "_Eigenaar"
 msgid "_Send Private Message"
 msgstr "Ver_stuur Privé Bericht"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Stem"
@@ -1411,7 +1495,7 @@ msgstr "_Stem"
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Van"
 
@@ -1433,8 +1517,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 #, fuzzy
 msgid "Delete"
 msgstr "Wis MOTD"
@@ -1482,35 +1566,40 @@ msgstr "_Zoek"
 msgid "_Log conversation history"
 msgstr "Gespreksgeschiedenis"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Maak _Bladwijzer Voor Deze Ruimte"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 #, fuzzy
 msgid "Join this room automatically when I connect"
 msgstr "Stel een contactafbeelding in zodra ik verbinding maak"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Bijnaam:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Recent:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Binnengaan"
@@ -1542,7 +1631,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Print tijd:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2097,7 +2186,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2279,38 +2368,43 @@ msgid "All"
 msgstr ""
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "_Abonnement"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Weigeren"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 #, fuzzy
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 #, fuzzy
 msgid "all in the group"
 msgstr "In de groep"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2318,21 +2412,21 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 #, fuzzy
 msgid "to send me messages"
 msgstr "Bericht verzenden"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to send me status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 #, fuzzy
 msgid "to view my status"
 msgstr "Sta hem/haar toe mijn status te zien"
@@ -2526,109 +2620,11 @@ msgstr "Verwijder account van Gajim en van de server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Verwijder"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-#, fuzzy
-msgid "A_sk to see his/her status"
-msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "<b>Visuele Meldingen</b>"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Wijs Open_PGP Sleutel toe"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "Wijzig _Groepen"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr ""
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Verwijder"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-#, fuzzy
-msgid "Send Single _Message..."
-msgstr "Enkel _Bericht Verzenden"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "_Bestand Verzenden"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Start _Gesprek"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#, fuzzy
-msgid "_Allow him/her to see my status"
-msgstr "Sta hem/haar toe mijn status te zien"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Forbid him/her to see my status"
-msgstr "Verbiedt hem/haar mijn status te zien"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "_Inhoud"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Hernoem"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Abonnement"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "_Verder"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2759,7 +2755,7 @@ msgid "_Add contact"
 msgstr "_Contact Toevoegen"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "Contact Informatie"
@@ -2991,27 +2987,6 @@ msgstr "_Bericht"
 msgid "_Presence"
 msgstr "_Aanwezigheid"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-#, fuzzy
-msgid "Add Special _Notification"
-msgstr "<b>Visuele Meldingen</b>"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Wijs Open_PGP Sleutel toe"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Wijzig _Groepen"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Hernoem"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Account Be_werken..."
@@ -3057,51 +3032,51 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Activated"
 msgstr "Actief"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Deactivated"
 msgstr "Actief"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Integer"
 msgstr "In de groep"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Voorkeur Naam"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Waarde"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Niets)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Verborgen"
 
@@ -3115,257 +3090,256 @@ msgstr ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "German"
 msgstr "Algemeen"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Greek"
 msgstr "groen"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Croatian"
 msgstr "Locatie"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Italian"
 msgstr "Schuingedrukt"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Polish"
 msgstr "_Publiceren"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Serbian"
 msgstr "Algemeen"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Onderstreept"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Uit_schoppen"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "Lettertype:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Contact Informatie"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "niet in het rooster"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 "%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Gebruik aanmelding"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Gebruik aanmelding"
@@ -3373,101 +3347,58 @@ msgstr "Gebruik aanmelding"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Commando's: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Gebruik: /%s, leegt het tekst venster."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, fuzzy, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Gebruik: /%s, leegt het tekst venster."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
-"gebruiken. (bijv. /%s loopt...)"
-
-#: ../src/chat_control.py:1777
-#, fuzzy, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Gebruik: /%s, zet het groepsgespreksvenster op compacte modus."
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Gebruik: /%s, leegt het tekst venster."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Geen hulp beschikbaar voor /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Je hebt zojuist een nieuw bericht ontvangen van \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3475,22 +3406,22 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
@@ -3499,23 +3430,23 @@ msgstr "%(nick)s is nu %(status)s"
 msgid "creating logs database"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is een bestand, maar een map werd verwacht"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim sluit nu af"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is een map, maar een bestand werd verwacht"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "map %s wordt aangemaakt"
@@ -3587,9 +3518,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 #, fuzzy
 msgid "Groupchats"
 msgstr "Groupsgesprek"
@@ -3608,135 +3539,176 @@ msgstr "Gajim - één ongelezen bericht"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Gebruik DBus en Notification-Daemon om notificaties weer te geven"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tijd in minuten waarna je statusbericht op afwezig ingesteld wordt"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Afwezig vanwege inactiviteit"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Tijd in minuten waarna je statusbericht op niet beschikbaar ingesteld wordt."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Niet beschikbaar vanwege inactiviteit"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "statusbericht"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Bijnaam Veranderen"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "statusbericht"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "Wis MOTD"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Indien Aan, verwijder niet */_ . Zodat *abc* vetgedrukt wordt, maar zonder "
 "dat * * verwijdert wordt."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Voeg * en [n] toe aan roster titel?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3744,12 +3716,26 @@ msgstr ""
 "Hoeveel regels te onthouden van het vorige gesprek zodra een gesprekstab of -"
 "venster heropend wordt."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hoeveel minuten zouden regels van het vorige gesprek onthouden moeten worden."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3757,11 +3743,11 @@ msgstr ""
 "Stuur bericht na Ctrl+Enter en slechts Enter maakt een nieuwe regel "
 "(Standaard gedrag van Mirabilis ICQ)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hoeveel regels op te slaan voor Ctrl+Omhoog"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3770,11 +3756,11 @@ msgstr ""
 "Óf een aangepaste url met %s erin verwerkt, waar %s is een woord/zin, óf "
 "'WIKTIONARY' wat betekent dat wiktionary gebruikt zal worden."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Indien aangevinkt zal Gajim bestuurd kunnen worden met gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3782,29 +3768,29 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
@@ -3812,7 +3798,7 @@ msgid ""
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
@@ -3820,13 +3806,13 @@ msgid ""
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3835,28 +3821,28 @@ msgstr ""
 "Forceert de host die opgegeven wordt voor bestandsoverdrachten in het geval "
 "van een NAT of port forwarding."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Volgens de IEC standaard is 1 KiB = 1024 bytes, 1 KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Laat tabs zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Laat tab rand zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Laat sluit knop zien in tabs?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3864,12 +3850,12 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
@@ -3877,7 +3863,7 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3885,13 +3871,13 @@ msgstr ""
 "Indien Aan stopt Gajim zodra het venster gesloten wordt. Deze instelling is "
 "alleen geldig als het icoon in het notificatiegebied gebruikt wordt."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Indien Aan registreerd Gajim xmpp:// bij elke start."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3899,7 +3885,7 @@ msgstr ""
 "Indien Aan zal Gajim een icoon op elke tab weergeven met ongelezen "
 "berichten. Afhankelijk van het thema kan dit icoon geanimeerd zijn."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -3908,11 +3894,11 @@ msgstr ""
 "Indien Aan zal Gajim het statusbericht van contacten weergeven onder hun "
 "naam in het roostervenster, indien deze niet leeg is"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3920,7 +3906,7 @@ msgstr ""
 "Indien Aan zal Gajim contactafbeeldingen ophalen voor elk contact waarvan "
 "geen bekend is, of de laatste afbeelding te oud is."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3929,7 +3915,7 @@ msgstr ""
 "Indien Uit zullen geen statusberichten weergeven worden in gesprekken "
 "wanneer een contact zijn/haar status aanpassen."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3938,35 +3924,35 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3974,7 +3960,7 @@ msgid ""
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3986,52 +3972,52 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4040,294 +4026,326 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Eten"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Werken"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Uit"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Ik ben uit van het leven genieten"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 #, fuzzy
 msgid "I'm available."
 msgstr "Aanwezig"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Open voor Gesprek"
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 #, fuzzy
 msgid "I'm not available."
 msgstr "Niet Beschikbaar"
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4336,181 +4354,188 @@ msgstr ""
 "Geluid om af te spelen wanneer een MUC bericht je bijnaam of een van de "
 "woorden in much_highlight_words bevat."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "groen"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "kruidenier"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "menselijk"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, fuzzy
 msgid "Wrong host"
 msgstr "Wachtwoord"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Transport %s heeft niet op tijd geantwoord met registratie informatie"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard publicatie is met succes afgerond"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Bijnaam niet gevonden: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Die ruimte bestaat niet."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Ruimte creatie is beperkt."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Je geregistreerde bijnaam moet gebruikt worden."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Je staat niet in de ledenlijst"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we zijn nu op %s geabonneert"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "afmelding verzocht van %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we zijn nu van %s afgemeld"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4520,286 +4545,272 @@ msgstr ""
 "rooster. Gebruik een roostermanagement applicatie zoals http://jru."
 "jabberstudio.org/ om het te verwijderen"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP wachtwoord niet opgegeven"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Je zult verbonden worden met %s zonder OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Opgeslagen in: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Verbinding"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Controleer je verbinding of probeer later nogmaals"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fout tijdens versturen"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4808,31 +4819,41 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Inhoud"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr ""
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "vCard publicatie is mislukt"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transporten"
 
@@ -4842,14 +4863,19 @@ msgid "Not in roster"
 msgstr "niet in het rooster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python koppeling ontbreekt op deze computer"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogelijkheden van Gajim kunnen niet worden gebruikt"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
@@ -4930,66 +4956,69 @@ msgid "eleven"
 msgstr "Wis MOTD"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr ""
 
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy
+#, fuzzy, python-format
 msgid "five past %(0)s"
 msgstr "Registreer met %s"
 
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy
+#, fuzzy, python-format
 msgid "ten past %(0)s"
 msgstr "Registreer met %s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy
+#, fuzzy, python-format
 msgid "quarter past %(0)s"
 msgstr "Registreer met %s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty past %(0)s"
 msgstr "Registreer met %s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty five past %(0)s"
 msgstr "Registreer met %s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr ""
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty five to %(1)s"
 msgstr "Registreer met %s"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty to %(1)s"
 msgstr "Registreer met %s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy
+#, fuzzy, python-format
 msgid "quarter to %(1)s"
 msgstr "Registreer met %s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy
+#, fuzzy, python-format
 msgid "ten to %(1)s"
 msgstr "Registreer met %s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy
+#, fuzzy, python-format
 msgid "five to %(1)s"
 msgstr "Registreer met %s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr ""
 
@@ -5060,228 +5089,228 @@ msgstr "Ongeldig character in hostnaam."
 msgid "Invalid character in resource."
 msgstr "Ongeldig character in bron."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Niet Beschikbaar"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "Open voor _Gesprek"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Aanwezig"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Aanwezig"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "Onz_ichtbaar"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Onbekend"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Heeft fouten"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Geen"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Aan"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Geen"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 #, fuzzy
 msgid "Owner"
 msgstr "_Eigenaar"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 #, fuzzy
 msgid "Member"
 msgstr "_Lid"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "is een bericht aan het typen..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tab gesloten"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bericht verzenden"
 msgstr[1] "Bericht verzenden"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5297,11 +5326,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "fout: kan %s niet voor lezen openen"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyaan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "logboek database wordt aangemaakt"
@@ -6013,82 +6042,94 @@ msgid ""
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP wachtwoord niet opgegeven"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Je zult verbonden worden met %s zonder OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Om verdere berichten te versturen en ontvangen, moet je de verbinding "
 "opnieuw in stand brengen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr ""
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6099,291 +6140,297 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "fout tijdens versturen"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Statusbericht"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Inschakelen"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "statusbericht"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "Beheer Accounts"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Een Jabber ID moet in de vorm \"gebruiker@servernaam\" zijn."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr ""
 "Er trad een probleem op bij het ophalen van je geheime OpenPGP sleutels."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Je moet een account aanmaken voordat persoonlijke informatie kan worden "
 "aangepast."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Zonder verbinding is het niet mogelijk persoonlijke informatie aan te passen."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Je moet een account aanmaken voordat persoonlijke informatie kan worden "
 "aangepast."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
+
+#: ../src/config.py:2289
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6393,62 +6440,62 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 #, fuzzy
 msgid "Default"
 msgstr "Wis MOTD"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Print tijd:"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Print tijd:"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6456,70 +6503,68 @@ msgstr ""
 "bladwijzer."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Je kunt geavanceerde accountopties instellen door op de Geavanceerd knop te "
 "drukken, of later via Accounts in het Bewerken menu van het hoofdvenster."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6529,7 +6574,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6537,77 +6582,77 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Contactnaam"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contact is Ingelogd"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 #, fuzzy
 msgid "Message Sent"
 msgstr "_Bericht"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6616,76 +6661,76 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "A_fsluiten"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "\"%s\" ontbreekt in de URL van het woordenboek en het is geen WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Gisteren"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagen geleden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber IM Client"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6721,132 +6766,132 @@ msgstr "Contactnaam"
 msgid "Set Mood"
 msgstr "Stel MOTD in"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusbericht"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Extra Adres:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vul de informatie van de contactpersoon in die je aan account %s toe wilt "
 "voegen"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vul de informatie in van de contactpersoon die je toe wilt voegen"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Ongeldige Gebruikers ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 #, fuzzy
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Een GTK+ jabber client"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6855,99 +6900,111 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Ongeldige account naam"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr ""
+"Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
+"contacten."
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6957,311 +7014,311 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nieuw Bericht"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nieuw Enkel Bericht"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Ontvangen %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Van %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Adres"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Be_werk"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Groep"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Beschrijving: %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 #, fuzzy
 msgid "Condition"
 msgstr "Verbinding"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7269,38 +7326,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7310,26 +7367,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7425,20 +7482,20 @@ msgstr "Beschrijving"
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Bladwijzer bestaat al"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Ruimte \"%s\" heeft al een bladwijzer."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Je kunt bladwijzers beheren via het Acties menu in je rooster."
 
@@ -7452,15 +7509,15 @@ msgstr "Abonneren"
 msgid "Node"
 msgstr "Geen"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Abonneer"
@@ -7904,31 +7961,31 @@ msgstr "Gajim vereist een Xserver en zal nu stoppen..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim vereist GTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim vereist GTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Libglade ondersteuning ontbreekt in de GTK+ runtime"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7936,23 +7993,23 @@ msgid ""
 msgstr ""
 "Verwijder je GTK+ runtime en installeer de laatste stabiele versie van %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Controleer of gtk en pygtk ondersteuning hebben voor libglade op je systeem."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7960,45 +8017,45 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Je zult verbonden worden met %s zonder OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8009,185 +8066,191 @@ msgstr ""
 "gebruiker.\n"
 "Geef een andere bijnaam op:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Verbinding"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fout bij lezen bestand:"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fout tijdens versturen"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Contact \"%s\" heeft je toestemming gegeven zijn status te zien."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Abonneer"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met \"%s\""
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s is nu bekend als %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Je wachtwoord is incorrect"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Vraag mij dit niet nogmaals"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Je hebt ongelezen berichten"
 msgstr[1] "Je hebt ongelezen berichten"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8197,93 +8260,93 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Je hebt %(filename)s met succes van %(name)s ontvangen."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Je hebt %(filename)s met succes aan %(name)s gestuurd."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Bij elk _bericht"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Vul de informatie in voor je nieuwe account</b>"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Bron: "
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8291,15 +8354,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8310,12 +8373,12 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Verbinding"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
@@ -8324,52 +8387,52 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Je kunt een ruimte niet binnengaan terwijl je onzichtbaar bent"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
@@ -8406,12 +8469,13 @@ msgstr ""
 "aparte regel"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "account"
 
@@ -8436,9 +8500,9 @@ msgstr "status"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "een van: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "bericht"
 
@@ -8456,26 +8520,51 @@ msgstr ""
 "status"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Verander de status van de account of accounts"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_teit"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Ik wil een nieuwe account _registreren"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"verander status van account \"account\". Indien niet opgegeven, probeer de "
+"status van alle accounts te veranderen die synchroniseren met de globale "
+"status"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Laat het gespreksvenster zien zodat je berichten kunt versturen aan een "
 "contact"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID van de contact waar je me in gesprek wilt gaan"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "Indien opgegeven zal contact van de contactlijst van deze account gehaald "
 "worden"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8486,30 +8575,30 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "inhoud bericht"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp sleutel"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "indien opgegeven zal het bericht versleuteld worden met deze publieke sleutel"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "indien opgegeven zal het bericht verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8520,120 +8609,120 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "subject"
 msgstr "Onderwerp:"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "message subject"
 msgstr "_Bericht"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID van contact"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 #, fuzzy
 msgid "Name of the account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "bestand"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Bestandspad"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "indien opgegeven zal bestand verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Laat alle voorkeuren zien en hun waarden"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Zet waarde van 'sleutel' op 'waarde'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "sleutel=waarde"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'key' is de naam van de voorkeur, 'waarde' is de waarde die zal worden "
 "ingesteld"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Verwijdert een voorkeur onderdeel"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "sleutel"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "naam van de voorkeur die verwijderd zal worden"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Schrijft de huidige staat van de Gajim voorkeuren weg naar het .config "
 "bestand"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Voegt contact toe aan rooster"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Voegt een nieuwe contact toe aan deze account"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
@@ -8641,109 +8730,109 @@ msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 #, fuzzy
 msgid "XML to send"
 msgstr "XML Console"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "inhoud bericht"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "Nieuwe Ruimte _Binnengaan"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "room"
 msgstr "Van"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Ruimte:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "nick"
 msgstr "Uit_schoppen"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "password"
 msgstr "Wachtwoord:"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument \"contact_jid\" ontbreekt"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8752,31 +8841,31 @@ msgstr ""
 "'%s' staat niet op je rooster.\n"
 "Geef een account op om het bericht mee te sturen."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumenten:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s niet gevonden"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8785,7 +8874,7 @@ msgstr ""
 "Gebruik: %s commando [argumenten]\n"
 "Commando is een van:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8794,7 +8883,7 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8803,7 +8892,7 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Wachtwoord"
@@ -8834,320 +8923,177 @@ msgstr "Je kunt je huidige thema niet verwijderen"
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Je bent niet meer in ruimte \"%s\" of \"%s\" heeft de ruimte verlaten."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Verander Bij_naam"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Gespreksgeschiedenis"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Verbinding"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aansluiting: "
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "In de groep"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Bijnaam niet gevonden: %s"
-
-#: ../src/groupchat_control.py:1530
-#, fuzzy
-msgid "This group chat has no subject"
-msgstr "Deze ruimte heeft geen onderwerp"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Bijnaam niet gevonden: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Gebruik: /%s <bijnaam|JID> [reden], verbant de JID uit de ruimte. De bijnaam "
-"van een aanwezige gebruiker mag gebruikt worden, maar niet als deze een \"@"
-"\" bevat. Als de JID zich momenteel in de ruimte bevindt, zal hij eruit "
-"geschopt worden. Ondersteunt GEEN spaties in de bijnaam."
-
-#: ../src/groupchat_control.py:1734
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
-"gebruiker."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Gebruik: /%s [reden], sluit de huidige tab of venster, en laat reden achter "
-"indien opgegeven."
-
-#: ../src/groupchat_control.py:1746
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Gebruik: /%s <JID> [reden], nodigt JID uit de huidige ruimte binnen te "
-"komen, met optioneel de opgegeven reden."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Gebruik: /%s <ruimte>@<server>[/bijnaam], biedt aan ruimte@server binnen te "
-"gaan, optioneel met de opgegeven bijnaam."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Gebruik: /%s <bijnaam> [reden], verwijdert de gebruiker met de opgegeven "
-"bijnaam van de ruimte, optioneel met de opgegeven reden. Ondersteunt GEEN "
-"spaties in de bijnaam."
-
-#: ../src/groupchat_control.py:1762
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Gebruik: /%s <bijnaam> [bericht], opent een privé gespreksvenster en stuurt "
-"bericht naar de gebruiker met de opgegeven bijnaam."
-
-#: ../src/groupchat_control.py:1767
-#, fuzzy, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
-
-#: ../src/groupchat_control.py:1771
-#, fuzzy, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr ""
-"Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
-"onderwerp bij naar de opgegeven tekst."
-
-#: ../src/groupchat_control.py:1775
-#, fuzzy, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
-"onderwerp bij naar de opgegeven tekst."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Gebruik: /%s <bericht>, stuurt een bericht zonder naar commando's te zoeken."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Weet je zeker dat je de ruimte \"%s\" wilt verlaten?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Als je dit venster sluit zal de verbinding verbroken worden met deze ruimte."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -9222,6 +9168,15 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Sla Bestand op als..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Groupsgesprek"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Ik zou je graag aan mijn rooster toe willen voegen"
+
 #: ../src/history_manager.py:121
 #, fuzzy
 msgid "Cannot find history logs database"
@@ -9301,55 +9256,64 @@ msgstr "Gespreksgeschiedenis van %s"
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Fout bij lezen bestand:"
+
+#: ../src/history_window.py:440
+msgid "Error"
+msgstr ""
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr ""
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Afbeelding is te groot"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 #, fuzzy
 msgid "Chats"
 msgstr "Gesprek"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 #, fuzzy
 msgid "Group Chats"
 msgstr "Groupsgesprek"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Gesprek"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 #, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
@@ -9411,12 +9375,12 @@ msgstr "_Verder"
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "Bestandspad"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "Die ruimte bestaat niet."
@@ -9424,7 +9388,7 @@ msgstr "Die ruimte bestaat niet."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr ""
 
@@ -9458,46 +9422,46 @@ msgstr ""
 "Er trad een fout up bij het publiceren van je persoonlijke informatie, "
 "probeer het later nogmaals."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Als \"%s\" dit verzoek aanneemt zal je zijn status kunnen ontvangen."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9506,28 +9470,28 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Weet je zeker dat je de ruimten \"%s\" wilt verlaten?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9536,16 +9500,16 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9554,12 +9518,12 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9568,61 +9532,74 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
+"contacten."
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Inhoud"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Verwijder"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -9632,12 +9609,12 @@ msgstr ""
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9645,17 +9622,17 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Ik wil dat deze contact mijn status blijf zien na verwijdering"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9664,27 +9641,42 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
+"contacten."
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -9692,31 +9684,31 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ongeldig Bestand"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s wil je een bestand sturen:"
 msgstr[1] "%s wil je een bestand sturen:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Stuur %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Stuurt een bestand aan contact"
@@ -9726,128 +9718,139 @@ msgstr "Stuurt een bestand aan contact"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "aan %s account"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "via %s account"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Beheer Bladwijzers..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publiceren"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Ontdek Services..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Ver_stuur Server Bericht"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 #, fuzzy
 msgid "To all online users"
 msgstr "_Online Gebruikers"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Ik zou je graag aan mijn rooster toe willen voegen"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Inhoud"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Wijzig _Groepen"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ver_stuur Enkel Bericht"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr ""
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transporten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transporten"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Hernoem"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "Contact is Ingelogd"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "Groupsgesprek"
+msgid "_Disconnect"
+msgstr "Contact is Ingelogd"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 #, fuzzy
 msgid "History Manager"
 msgstr "_Geschiedenis"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
@@ -9864,20 +9867,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9887,7 +9890,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10082,6 +10085,143 @@ msgstr ""
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
+#, fuzzy
+#~ msgid "Add Special _Notification"
+#~ msgstr "<b>Visuele Meldingen</b>"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Wijs Open_PGP Sleutel toe"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Commando's: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Gebruik: /%s, leegt het tekst venster."
+
+#, fuzzy
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Gebruik: /%s, leegt het tekst venster."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
+#~ "gebruiken. (bijv. /%s loopt...)"
+
+#, fuzzy
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Gebruik: /%s, zet het groepsgespreksvenster op compacte modus."
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Gebruik: /%s, leegt het tekst venster."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Geen hulp beschikbaar voor /%s"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Bijnaam niet gevonden: %s"
+
+#, fuzzy
+#~ msgid "This group chat has no subject"
+#~ msgstr "Deze ruimte heeft geen onderwerp"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Bijnaam niet gevonden: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Gebruik: /%s <bijnaam|JID> [reden], verbant de JID uit de ruimte. De "
+#~ "bijnaam van een aanwezige gebruiker mag gebruikt worden, maar niet als "
+#~ "deze een \"@\" bevat. Als de JID zich momenteel in de ruimte bevindt, zal "
+#~ "hij eruit geschopt worden. Ondersteunt GEEN spaties in de bijnaam."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
+#~ "gebruiker."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Gebruik: /%s [reden], sluit de huidige tab of venster, en laat reden "
+#~ "achter indien opgegeven."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Gebruik: /%s <JID> [reden], nodigt JID uit de huidige ruimte binnen te "
+#~ "komen, met optioneel de opgegeven reden."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Gebruik: /%s <ruimte>@<server>[/bijnaam], biedt aan ruimte@server binnen "
+#~ "te gaan, optioneel met de opgegeven bijnaam."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Gebruik: /%s <bijnaam> [reden], verwijdert de gebruiker met de opgegeven "
+#~ "bijnaam van de ruimte, optioneel met de opgegeven reden. Ondersteunt GEEN "
+#~ "spaties in de bijnaam."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Gebruik: /%s <bijnaam> [bericht], opent een privé gespreksvenster en "
+#~ "stuurt bericht naar de gebruiker met de opgegeven bijnaam."
+
+#, fuzzy
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
+
+#, fuzzy
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr ""
+#~ "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
+#~ "onderwerp bij naar de opgegeven tekst."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
+#~ "onderwerp bij naar de opgegeven tekst."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Gebruik: /%s <bericht>, stuurt een bericht zonder naar commando's te "
+#~ "zoeken."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Klik om mogelijkheden (zoals MSN, ICQ transporten) van jabber servers te "
diff --git a/po/no.po b/po/no.po
index 8d63d2663..7847b7a71 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:58+0200\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team:  <>\n"
@@ -212,6 +212,7 @@ msgstr "<b>Personlig Informasjon</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Konto"
 
@@ -278,8 +279,8 @@ msgstr "Rediger Personlig Informasjon..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -290,8 +291,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Generelle"
 
@@ -350,25 +351,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ingen"
 
@@ -525,8 +522,8 @@ msgstr ""
 "Du kan også vurdere å endre mulige brannmur innstillinger."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -540,7 +537,7 @@ msgid "Mer_ge accounts"
 msgstr "Sammenslåin_g av kontoer"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
@@ -801,7 +798,7 @@ msgid "All statuses"
 msgstr "Alle statuser"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Borte"
 
@@ -818,7 +815,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -827,7 +824,7 @@ msgid "Launch a command"
 msgstr "Kjør en kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
@@ -1013,7 +1010,7 @@ msgid "Join _Group Chat"
 msgstr "Bli med i _Gruppe Samtale"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Legg til Kontaktliste..."
 
@@ -1039,39 +1036,6 @@ msgstr "_Åpne Link i Nettleser"
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Inviter _Kontakter"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Send _Fil"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Endre Ende til Ende Kryptering"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Endre Open_PGP Kryptering"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Legg til Kontaktliste"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Historie"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "In_viter"
@@ -1096,6 +1060,119 @@ msgstr ""
 "Du kommer nå til å starte en Fler-Bruker Samtale.\n"
 "Velg kontaktene du ønsker å invitere"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "F_orespør å se hans/hennes status"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Legg til Spesielt _Varsel"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Tilegn Open_PGP Nøkkel..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Kjør Kommando..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Rediger _Grupper..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "In_viter til"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Inviter _Kontakter"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "_Fjern"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Send Egendefiner_t Status"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Send Enkel _Melding..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Send _Fil..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Velg Egendefinert _Avatar..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Start _Samtale"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Endre Ende til Ende Kryptering"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Endre Open_PGP Kryptering"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Tillat han/henne å se min status"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Blokker"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Forby han/henne å se min status"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Historie"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignorer"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Behandle Kontakt"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Gi nytt navn..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Abonnement"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Frigi"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Ikke ignorer"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Fyll inn skjemaet."
@@ -1212,7 +1289,7 @@ msgstr ""
 "Kontakt rad\n"
 "Samtale Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Fet"
 
@@ -1236,7 +1313,7 @@ msgstr "Borte"
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1308,6 +1385,14 @@ msgstr "M_odererer"
 msgid "Occupant Actions"
 msgstr "Beboer Handlinger"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Send _Fil"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Legg til Kontaktliste"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1316,13 +1401,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Blokker"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Kast ut"
@@ -1339,13 +1417,6 @@ msgstr "_Eier"
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Frigi"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Stemme"
@@ -1354,7 +1425,7 @@ msgstr "_Stemme"
 msgid "Create new post"
 msgstr "Lag en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Fra"
 
@@ -1378,8 +1449,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Historikk og Logg Behandler</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Slett"
 
@@ -1432,34 +1503,39 @@ msgstr "Søk:"
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "_Bokmerke dette rommet (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Gå inn i dette rommet automatisk ved tilkobling"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Nylig:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Bli med"
@@ -1488,7 +1564,7 @@ msgstr "Minimer ved Automatisk Deltakelse"
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2023,7 +2099,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2190,34 +2266,39 @@ msgid "All"
 msgstr "Alle"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "alle etter abonnement"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Tillate"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Nekt"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "alle etter abonnement"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "alle i gruppen"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2229,19 +2310,19 @@ msgstr ""
 "fra\n"
 "til"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "å sende meg meldinger"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "å sende meg forespørsler"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "å sende meg status"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "å se min status"
 
@@ -2409,96 +2490,11 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "F_orespør å se hans/hennes status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Legg til Spesielt _Varsel"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Tilegn Open_PGP Nøkkel..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Rediger _Grupper..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Kjør Kommando..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "In_viter til"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "_Fjern"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Send Egendefiner_t Status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Send Enkel _Melding..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Send _Fil..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Velg Egendefinert _Avatar..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Start _Samtale"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Tillat han/henne å se min status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Forby han/henne å se min status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignorer"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Behandle Kontakt"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Gi nytt navn..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Abonnement"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Ikke ignorer"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2620,7 +2616,7 @@ msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Informasjon"
 
@@ -2835,26 +2831,6 @@ msgstr "_Melding"
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Legg til Spesiell _Alarm"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Tilegn Open_PGP Nøkkel"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Rediger _Grupper"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Gi Nytt Navn"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
@@ -2898,48 +2874,48 @@ msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Aktivert"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Deaktivert"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Nummer"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Farge"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Foretrukket Navn"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Skrive"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Gjemt"
 
@@ -2953,189 +2929,188 @@ msgstr "Du har mottatt en ny inntreden:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretagner"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Brtisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norsk (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Udefinert"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Syk"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "_Font:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktinformasjon"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Dersom du sender en fil til %s, vil han/henne kjenne din ekte Jabber ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering påslått"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "ikke i kontaktliste"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "En liste over aktive, komplette og stoppede fil overføringer"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Ukjent Artist"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Ukjent Tittel"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Ukjent Kilde"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3144,17 +3119,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
 "fra  <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3162,50 +3137,50 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "og IKKE autentisert"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3214,66 +3189,23 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Kommando ikke støttet for zeroconf konto."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Kommandoer: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Bruk: /%s, gjemmer samtale knappene."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Bruk: /%(command)s <action>, sender handling til gjeldende rom. Bruk tredje "
-"person. (f.eks.  /%(command)s eksploderer.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Bruk: /%s, sender en ping til kontakten"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Bruk: /%s, sender meldingen til kontakten"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Ingen hjelpe informasjon for /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3281,25 +3213,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Den følgende meldingen ble kryptert"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3307,15 +3239,15 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Database feil"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3324,7 +3256,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
@@ -3333,23 +3265,23 @@ msgstr "%(name)s er nå %(status)s"
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s er en fil men skulle ha vært en katalog"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er en katalog men skulle vært en fil"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
@@ -3413,9 +3345,9 @@ msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
@@ -3431,70 +3363,111 @@ msgstr "Videresend uleste meldinger"
 msgid "All unread messages have been forwarded."
 msgstr "Alle uleste meldinger har blitt videresendt."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før status endres til borte."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Borte på grunn av inaktivitet i mer enn $T min)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S vil bli byttet ut med gjeldende status melding, $T av automatisk borte "
 "tid. "
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før status endres til ikke tilgjengelig."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Ikke tilgjengelig på grunn av inaktivitet i mer enn $T min)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S vil bli byttet ut med gjeldende status melding, $T av auoxa tid."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Ugyldig kallenavn"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "status melding tekst"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Ugyldig kallenavn"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Endrer Kallenavn"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "status melding tekst"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "standard"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Slå på link-lokal/zeroconf meldinger"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Språk som brukes av ordlisten"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3504,7 +3477,7 @@ msgstr ""
 "'sometimes' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
 "'never' - aldri vis klokkeslett."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3514,18 +3487,18 @@ msgstr ""
 "4, eller 0 for å deaktivere fuzzyclock. 1 er den mest presise klokken, 4 er "
 "den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings symboler."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
 "fjernet."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3536,7 +3509,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (Dersom du ønsker å bruke dette, må du "
 "installere docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3544,7 +3517,7 @@ msgstr ""
 "Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i "
 "gruppesamtaler."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3552,7 +3525,7 @@ msgstr ""
 "Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er "
 "opptatt av noen andre i samtalegruppen."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3563,19 +3536,19 @@ msgstr ""
 "strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-"
 "time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tegn som skrives før kallenavnet i samtaler"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3583,12 +3556,26 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3596,11 +3583,11 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3609,11 +3596,11 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3625,12 +3612,12 @@ msgstr ""
 "at de synkroniserer med global status) basert på statusen til nettverks "
 "tilkoblingen."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3638,7 +3625,7 @@ msgstr ""
 "Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
 "avslått."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3646,11 +3633,11 @@ msgstr ""
 "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
 "det hvert x minutt."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3658,7 +3645,7 @@ msgstr ""
 "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3666,13 +3653,13 @@ msgstr ""
 "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3681,27 +3668,27 @@ msgstr ""
 "grensesnitt, for Fil Overføring i tilfelle adresse oversetting/port "
 "videresending."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Varsle om hendelser i system-statusfelt ikonet."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis notatblokk faner i samtalevinduer?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3712,16 +3699,16 @@ msgstr ""
 "separert med komma. Gyldige grupper er 1, 2, 5, 14, 15, 16, 17 og 18. Høyere "
 "nummer er mer sikre men tar lenger å kalkulere når du starter en sesjon. "
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvik nye meldinger i popup vindu?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3729,14 +3716,14 @@ msgstr ""
 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
 "på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Dersom True vil Gajim sjekke om den er standard jabber klient ved hver "
 "oppstart."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3744,7 +3731,7 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3752,12 +3739,12 @@ msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definer posisjo for avatar i kontaktlisten. Kan være venste eller høyre"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3765,7 +3752,7 @@ msgstr ""
 "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke hadde "
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3773,7 +3760,7 @@ msgstr ""
 "Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3786,29 +3773,29 @@ msgstr ""
 "hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
 "Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget ut."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis kontaktbilde for transporten selv."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3818,7 +3805,7 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3829,7 +3816,7 @@ msgstr ""
 "til gruppesamtaler"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3850,31 +3837,31 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Dersom True vil man kunne lukke fane/vindu med escape knappen."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Gjemmer knappene i samtale vinduer."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3882,15 +3869,15 @@ msgstr ""
 "I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den "
 "samme person som snakker som i den forrige meldingen."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Jevn tekstrulling av meldinger i samtale vinduene"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3898,11 +3885,11 @@ msgstr ""
 "Liste av farger, separert av \":\", som vil bli brukt til å farge kallenavn "
 "i gruppesamtaler."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab går til neste skrivefane når ingenting er ulest."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3910,7 +3897,25 @@ msgstr ""
 "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
 "innhold mener at vi aldri viser dialogen."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
+"innhold mener at vi aldri viser dialogen."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
+"innhold mener at vi aldri viser dialogen."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3920,7 +3925,7 @@ msgstr ""
 "kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
 "prioritet vil du ikke motta noen meldinger fra din server."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3928,7 +3933,7 @@ msgstr ""
 "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
 "konto passord."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3937,7 +3942,7 @@ msgstr ""
 "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
 "konto passord."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3945,7 +3950,7 @@ msgstr ""
 "Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
 "og gruppe rader. "
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3953,7 +3958,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Dersom ikke tom, behandle alle "
 "innkommende meldinger som om de var av denne typen."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3961,7 +3966,7 @@ msgstr ""
 "Dersom Sant vil Gajim skrolle og velge kontakten som sendte deg siste "
 "melding, om ikke samtalevinduet allerede er åpnet. "
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3969,18 +3974,18 @@ msgstr ""
 "Dersom Sant vil Gajim konvertere mellom $$ og $$ til et bilde med dvips og "
 "konvertere før innsetting i et samtale vindu."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tif med inaktivitet som behøves før endre status vinduet lukkes."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3988,11 +3993,11 @@ msgstr ""
 "Dersom Sant vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Velg intervall mellom 2 punkter av ledighet."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4000,7 +4005,7 @@ msgstr ""
 "Endre verdien for å endre størrelsen på lateks formlene som vises. Høyrere "
 "er større."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4009,13 +4014,23 @@ msgstr ""
 "Lovlige uri skjema. Bare skjema i denne listen vil bli aksepterte som en "
 "\"ekte\" uri."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4023,7 +4038,7 @@ msgstr ""
 "Prioritet vil endre automatisk i følge med din status. Prioritetene "
 "defineres i autopriority_* valgene."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4032,26 +4047,37 @@ msgstr ""
 "borte, xa, ikke forstyrr, usynlig. MERK: dette valget brukes bare dersom "
 "restore_last_status er deaktivert"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Dersom valgt, gjenopprett siste status brukt."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Dersom deaktivert, ikke signer tilstedeværelser med GPG nøkkel, selv om GPG "
 "er konfigurert."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne kontoen."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en kryptert sesjon når mulig?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4059,29 +4085,29 @@ msgstr ""
 "Ordnet liste (mellomrom separert) av tilkoblingstyper som skal prøves. Kan "
 "inneholde tls, ssl eller plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Vis en advarsels dialog før bruk av standard SSL bibliotek."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4091,11 +4117,11 @@ msgstr ""
 "på nytt."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4103,15 +4129,15 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4119,11 +4145,11 @@ msgstr ""
 "Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
 "meldinger skal logges?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4131,101 +4157,101 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "alle eller mellomroms separert status"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' eller ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4234,99 +4260,99 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Feil maskinnavn"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Ugyldig lokal adresse? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard publisering vellykket"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4335,77 +4361,84 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den (se http://trac.gajim."
 "org/wiki/DatabaseBackup) eller fjern den (all historikk vil bli borte)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kallenavn ikke lovlig: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Rommet har blitt ødelagt"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan bli med i dette rommet isteden: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nå på %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abonnerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4415,220 +4448,206 @@ msgstr ""
 "kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å "
 "fjerne den"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passordsetning ble ikke gitt"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til å få utsteders sertifikat"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til å skaffe sertifikatets CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til å dekryptere sertifikatets signatur"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til å dekryptere CRLens signatur"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Klarer ikke å dekode usteders offentlige nøkkel"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Sertifikat signatur feil"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "CRL signatur feil"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Sertifikatet er ikke gylig enda"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Sertifikatet har utløpt"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL er ikke gyldig enda"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL har utgått"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Formaterings feil i sertifkatets notBefore felt"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Formaterings feil i sertifikatets notAfter felt"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formaterings feil i CRLens lastUpdate felt"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formaterings feil i CRLens nextUpdate felt"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Tom for minne"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Selvsignert sertifikat"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsignert sertifikat i sertifikats kjeden"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Ute av stand til å få tak i lokal utsteders sertifikat"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Ute av stand til å verifisere det første sertifikatet"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Sertifikats kjeden er for lang"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Sertifikat tilbakekallt"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA sertifikat"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Stilengde begrensning overskredet"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Ikke støttet sertifkats hensikt"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Sertifikatet er ikke tiltrodd"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Sertifikatet avvist"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Tittel utsteder passer ikke"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og tittel nøkkel identifikator passer ikke"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og utsteder seriernummer passer ikke"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Tilkobling til konto %s har blitt mistet. Prøv igjen."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4637,7 +4656,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4646,24 +4665,24 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4672,18 +4691,18 @@ msgstr ""
 "Privatlivs listen %s har ikke blitt fjernet. Den er kanskje aktiv i en av "
 "dine tilkoblede ressurser. Deaktiver den og prøv igjen."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Enten er ikke en nøkkel tildelt ellers har ikke kontakten signert."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4691,12 +4710,12 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4705,30 +4724,40 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Inviter _Kontakter"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "vCard publisering feilet"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Observerere"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transporter"
 
@@ -4737,14 +4766,19 @@ msgid "Not in roster"
 msgstr "ikke i kontaktliste"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne maskinen"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
@@ -4821,56 +4855,69 @@ msgid "eleven"
 msgstr "elleve"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "klokken %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "fem over %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "ti over %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "kvart over %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "twenty past %(0)s"
 msgstr "ti på halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "twenty five past %(0)s"
 msgstr "fem på halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, fuzzy, python-format
 msgid "half past %(0)s"
 msgstr "halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "fem over halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "ti over halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "kvart på %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "ti på %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "fem på %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s"
 
@@ -4938,224 +4985,224 @@ msgstr "Ugyldig karakter i domene navn."
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Ordstyrere"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Ordstyrer"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "skriver en melding..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d melding venter"
 msgstr[1] "%d meldinger venter"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr "fra rom %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr "fra bruker %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr "fra %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hendelse venter"
 msgstr[1] "%d hendelser venter"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Feil i eksekvering av \"%(command)s\": %(error)s"
@@ -5171,11 +5218,11 @@ msgstr "%s er ikke et gyldig loggnivå"
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
@@ -5827,7 +5874,7 @@ msgstr ""
 "avbrutt."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5835,7 +5882,7 @@ msgstr ""
 "[Dette er en del av en kryptert sesjon. Dersom du ser denne meldingen gikk "
 "noe galt.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5844,15 +5891,27 @@ msgstr ""
 "Verten %s du konfigurerte har ft_add_hosts_to_send i avanserte valg og er "
 "ikke gyldig, så den ignoreres."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP passordsetning ble ikke gitt"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "For å sende og motta meldinger må du koble til på nytt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahi feil"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5861,31 +5920,31 @@ msgstr ""
 "%s\n"
 "Link-lokal meldinger fungerer muligens ikke riktig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Vennligst sjekk om Avahi eller Bonjour er installert."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Klarer ikke å lytte til port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5894,20 +5953,20 @@ msgstr ""
 "sendes."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5920,24 +5979,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Feil ved tilføying av tjeneste. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Standard Melding"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5946,70 +6005,70 @@ msgstr ""
 "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
 "språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "status melding tekst"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6017,139 +6076,145 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "For å endre konto navnet må du ikke være tilkoblet."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6157,11 +6222,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6169,11 +6234,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6181,11 +6246,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6193,7 +6258,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6210,124 +6275,123 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Kallenavn ikke lovlig: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, "
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dette sertifikatet er allerede i filen %s, så det legges ikke til igjen."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6342,7 +6406,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6353,63 +6417,63 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt i Fokus"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Neste Melding Motatt ikke i Fokus"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6419,7 +6483,7 @@ msgstr ""
 "har blitt motatt av andre enden. Dersom dette ikonet\n"
 "vises lenge er det sannsynlig at meldingen ble mistet."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6427,74 +6491,74 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt\n"
 "siden sist du fulgte med i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Avslutt"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Jabber ID allerede i listen"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber IDen du skrev inn er allerede i lsiten. Vennligst velg en ny. "
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
@@ -6529,125 +6593,125 @@ msgstr "Kontakt navn"
 msgid "Set Mood"
 msgstr "Sett Stemning"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Melding?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Dette navnet er allerede i bruk. Ønsker du å overskrive denne status "
 "meldingen?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Sist men ikke minst ønsker vi å takke alle de som lager installasjonspakker."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6660,88 +6724,98 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings forespørsel for konto %(account)s fra %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Ugyldig konto navn"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan ikke synkronisere med en konto uten å være tilkoblet."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6750,301 +6824,301 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Skjema %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Konsoll"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr "Adresse"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Humørsyk"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Gruppe"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rekkefølge:  %(order)s, handling: %(action)s, type: %(type)s, verdi: %(value)"
 "s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må skrive et navn for å lage en liste over uønskede."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har invitert deg til gruppesamtalen %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7055,19 +7129,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7077,19 +7151,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7104,23 +7178,23 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøkkel (%s) <b>passer ikke</b> med nøkkelen tildelt i Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
 "meldinger."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7129,7 +7203,7 @@ msgstr ""
 "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG klient "
 "for å stole på denne nøkkelen."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7224,20 +7298,20 @@ msgstr "Beskrivelse"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
 
@@ -7249,15 +7323,15 @@ msgstr "Abonnerte"
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
@@ -7713,31 +7787,31 @@ msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim trenger PyGTK 2.8 eller høyere"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim tenger PyGTK 2.8 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim trenger GTK 2.8 eller høyere"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim trenger GTK 2.8 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7746,20 +7820,20 @@ msgstr ""
 "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
 "versjon fra %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7769,11 +7843,11 @@ msgstr ""
 "på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7781,35 +7855,35 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7820,59 +7894,59 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Feil %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Abonnerings Forespørsel"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7880,77 +7954,77 @@ msgstr ""
 "Du vil alltid se han eller henne som frakoblet.\n"
 "Ønsker du å fjerne han eller henne fra din kontakt liste?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Fjern Abonnement"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nå kjent som %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har satt tittel til %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Rommet viser nå utilgjengelig medlem"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "rommet viser nå ikke utilgjengelige medlemmer"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "En non-privacy-related rom konfigurasjons ending har skjedd"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Rom logging er nå påslått"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Rom logging er nå avslått"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymisert"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymisert"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Romet er nå full-anonymisert"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Et passord kreves for å bli med i rommet %s. Vennligst skriv det."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7958,20 +8032,25 @@ msgstr ""
 "Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
 "som kjører eller den returnerte feil passord frase.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Passord setningen din er ikke riktig"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG fungerer ikke"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7980,13 +8059,14 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
 "meldinger."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7995,19 +8075,19 @@ msgstr ""
 "Gnome Keyring er installert men ikke \t\t\t\t\t\t\tstartet riktig (system "
 "variabel sikkert ikke \t\t\t\t\t\t\tsatt riktig)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Du har %d ny e-post samtale"
 msgstr[1] "Du har %d nye e-post samtaler"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8022,44 +8102,44 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8068,36 +8148,36 @@ msgstr ""
 "Ikke mulig å dekryptere melding fra %s\n"
 "Den kan ha blitt endret."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Feil."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8105,11 +8185,11 @@ msgstr ""
 "Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
 "et annet"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8120,15 +8200,15 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8145,11 +8225,11 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8157,11 +8237,11 @@ msgstr ""
 "Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
 "at du ønsker å gjøre det?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg ønsker å koble til usikkert"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8170,21 +8250,21 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "PEP noden ble ikke fjernet"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8192,7 +8272,7 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8202,13 +8282,13 @@ msgstr ""
 "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
@@ -8242,12 +8322,13 @@ msgstr ""
 "en egen linje"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "konto"
 
@@ -8274,9 +8355,9 @@ msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "melding"
 
@@ -8293,22 +8374,46 @@ msgstr ""
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Endrer status på konto eller kontoer"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priorit_et:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Jeg ønsker å _registrere en ny konto"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
+"til alle kontoer som har \"synkroniser med global status\" valget påslått"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8318,30 +8423,30 @@ msgstr ""
 "nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8351,137 +8456,137 @@ msgstr ""
 "nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sender nye meldinger to en gruppesamtale som du er tilkoblet."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID til rommet som vil motta meldingen"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på innstillingen, 'verdi' er gjeldende innstilling"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Legger til en ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer innstillinger (globale innstillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerer gjeldende status melding (den globale om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åpner 'Start Samtale' dialogen"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Starter samtale, med denne kontoen"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8489,72 +8594,72 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI til håndgrep"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Konto som du ønsker å benytte for å håndtere det"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "rom"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "passord"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8563,15 +8668,15 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ut som Gajim ikke kjører, så du kan ikke bruke gajim-remote. "
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8580,16 +8685,16 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8598,7 +8703,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8607,7 +8712,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8616,7 +8721,7 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Feil uri"
 
@@ -8645,296 +8750,152 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke lenger i samtalerommet \"%(room)s\" eller \"%(nick)s\" har dratt."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har satt eller endret ditt rom kallenavn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilknytning for %(nick)s har blitt satt til %(affiliation)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilknutning for %(nick)s har blitt satt til %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Kallenavn ikke funnet: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Dette gruppesamtalerommet har ikke tittel"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Invitert %(contact_jid)s til %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Kallenavn ikke funnet: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra "
-"samtalerommet. Kallenavnet til en bruker kan bli brukt, men ikke dersom det "
-"inneholder \"@\". Skulle en bruker med den JIDen være tilstede i rommet vil "
-"denne også bli kastet ut. Det støttes ikke med mellomrom i kallenavnet."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
-"spesifiserte brukeren."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
-"dersom spesifisert."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser "
-"en grunn dersom spesifisert."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
-"gir mulighet for å spesifisere valgfritt kallenavn."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av "
-"kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke "
-"mellomrom i kallenavn."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og "
-"sender meldingen til brukeren spesifisert av kallenavn."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
-"samtalerom."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
-"kommandoer."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
-"samtalerom."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av samtalerommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Dersom du lukker dette vinduet, så vil du bli koblet fra dette samtalerommet."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8942,22 +8903,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -9029,6 +8990,14 @@ msgstr "Bilde kan ikke lagres i %(type)s format. Lagre som %(new_filename)s?"
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Ny Gruppe Samtale"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Jeg ønsker å legge deg til min kontaktliste"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
@@ -9109,52 +9078,62 @@ msgstr "Samtale Historikk med %s"
 msgid "Disk Error"
 msgstr "Disk Feil"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Feil melding: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Feil."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ønsker du virkelig å slette den valgte meldingen?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -9215,18 +9194,18 @@ msgstr "_Ignorer"
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
@@ -9258,48 +9237,48 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9307,28 +9286,28 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9336,16 +9315,16 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått og kontakten er i kontaktlisten."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9353,11 +9332,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9366,57 +9345,69 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ønsker du å fjerne gruppen %s fra kontaktlisten?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Også fjerne alle kontakter i denne gruppen fra kontaktlisten"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9425,11 +9416,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9437,16 +9428,16 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9456,19 +9447,33 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du må lage en konto før du kan snakke med andre kontakter."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9476,13 +9481,13 @@ msgstr ""
 "Din server støtter ikke lagring av metakontakt informasjon, så denne "
 "informasjonen vil ikke bli lagret til neste tilkobling."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9492,23 +9497,23 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Ønsker du å sende denne filen til %s:"
 msgstr[1] "Ønsker du å sende disse filene til %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Send %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
@@ -9518,115 +9523,127 @@ msgstr "Gjør %s og %s metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Jeg ønsker å legge deg til min kontaktliste"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Rediger _Grupper"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Kjør Kommando..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Gi Nytt Navn"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Koble ifra"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Ny Gruppe Samtale"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Koble ifra"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
@@ -9643,20 +9660,20 @@ msgstr "Feil i motatt dataskjema"
 msgid "No result"
 msgstr "Ingen resultater"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Disk SkriveFeil"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Tittel: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9671,7 +9688,7 @@ msgstr ""
 "\n"
 "\tEr disse valgene akseptable?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9867,6 +9884,139 @@ msgstr "Det er ingen ventende abonnements forespørsler."
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Legg til Spesiell _Alarm"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Tilegn Open_PGP Nøkkel"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Kommando ikke støttet for zeroconf konto."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Kommandoer: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Bruk: /%s, gjemmer samtale knappene."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Bruk: /%(command)s <action>, sender handling til gjeldende rom. Bruk "
+#~ "tredje person. (f.eks.  /%(command)s eksploderer.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Bruk: /%s, sender en ping til kontakten"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Bruk: /%s, sender meldingen til kontakten"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Ingen hjelpe informasjon for /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Slå på link-lokal/zeroconf meldinger"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Kallenavn ikke funnet: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Dette gruppesamtalerommet har ikke tittel"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Invitert %(contact_jid)s til %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Kallenavn ikke funnet: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra "
+#~ "samtalerommet. Kallenavnet til en bruker kan bli brukt, men ikke dersom "
+#~ "det inneholder \"@\". Skulle en bruker med den JIDen være tilstede i "
+#~ "rommet vil denne også bli kastet ut. Det støttes ikke med mellomrom i "
+#~ "kallenavnet."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
+#~ "spesifiserte brukeren."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser "
+#~ "årsak dersom spesifisert."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og "
+#~ "viser en grunn dersom spesifisert."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server "
+#~ "og gir mulighet for å spesifisere valgfritt kallenavn."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av "
+#~ "kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke "
+#~ "mellomrom i kallenavn."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu "
+#~ "og sender meldingen til brukeren spesifisert av kallenavn."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
+#~ "samtalerom."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
+#~ "kommandoer."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
+#~ "samtalerom."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
diff --git a/po/pl.po b/po/pl.po
index 456949c75..cc8c9b6f1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-19 23:59+0200\n"
 "Last-Translator: Sławomir Domagała <godlark@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -215,6 +215,7 @@ msgstr "<b>Informacje o sobie</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Konto"
 
@@ -281,8 +282,8 @@ msgstr "Zmień informacje o sobie..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -293,8 +294,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Ogólne"
 
@@ -353,25 +354,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Żaden"
 
@@ -527,8 +524,8 @@ msgstr ""
 "Konieczna stać się może ponowna konfiguracja firewalla."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -542,7 +539,7 @@ msgid "Mer_ge accounts"
 msgstr "_Połącz konta"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
@@ -793,7 +790,7 @@ msgid "All statuses"
 msgstr "Dowolny status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Zaraz wracam"
 
@@ -810,7 +807,7 @@ msgid "Have "
 msgstr "rozmawiam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Niewidoczny"
 
@@ -819,7 +816,7 @@ msgid "Launch a command"
 msgstr "Wykonaj komendę"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Nieobecny"
 
@@ -1003,7 +1000,7 @@ msgid "Join _Group Chat"
 msgstr "Dołącz do _pokoju"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "Dod_aj do listy kontaktów..."
 
@@ -1029,39 +1026,6 @@ msgstr "_Otwórz Link w przeglądarce"
 msgid "_Start Chat"
 msgstr "_Rozpocznij rozmowę"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Zaproś kontakty"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Wyślij _plik"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Włącz/wyłącz _szyfrowanie połączenia"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Włącz/wyłącz szyfrowanie Open_PGP"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "Dod_aj do listy kontaktów"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Historia"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "_Zaproś"
@@ -1086,6 +1050,119 @@ msgstr ""
 "Zamierzasz rozpocząć czat.\n"
 "Wybierz kontakty, które chcesz do niego zaprosić"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "P_oproś o to, żeby móc widzieć jego/jej status"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Dodaj powiadomienia _specjalne..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Przypisz klucz Open_PGP..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Wykonaj komendę..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Modyfikuj _grupy..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "Za_proś do"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Zaproś kontakty"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "Us_uń"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Wyślij odrębny status"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Wyślij _wiadomość..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Wyślij _plik..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Ustaw własny _avatar..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Rozpocznij _rozmowę"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Włącz/wyłącz _szyfrowanie połączenia"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Włącz/wyłącz szyfrowanie Open_PGP"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Pozwól mu/jej widzieć swój status"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Zablokuj"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Zabroń mu/jej widzieć twój status"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Historia"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "Ignoruj"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Modyfikuj dane kontaktu"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Zmień nazwę..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Autoryzacja"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Cofnij blokadę"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Cofnij ignorowanie"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Wypełnij formularz."
@@ -1202,7 +1279,7 @@ msgstr ""
 "Kontakt\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Wytłuszczone"
 
@@ -1226,7 +1303,7 @@ msgstr "Zniknął"
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Kursywa"
 
@@ -1298,6 +1375,14 @@ msgstr "Mo_derator"
 msgid "Occupant Actions"
 msgstr "Działania użytk_ownika"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Wyślij _plik"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "Dod_aj do listy kontaktów"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administrator"
@@ -1306,13 +1391,6 @@ msgstr "_Administrator"
 msgid "_Ban"
 msgstr "Za_banuj"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Zablokuj"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "Wy_rzuć"
@@ -1329,13 +1407,6 @@ msgstr "_Właściciel"
 msgid "_Send Private Message"
 msgstr "_Wyślij prywatną wiadomość"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Cofnij blokadę"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Głos"
@@ -1344,7 +1415,7 @@ msgstr "_Głos"
 msgid "Create new post"
 msgstr "Utwórz nowy wpis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Od"
 
@@ -1369,8 +1440,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Witaj w menedżerze historii rozmów Gajima</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Usuń"
 
@@ -1424,34 +1495,39 @@ msgstr "Szukaj"
 msgid "_Log conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Dodaj pokój do zakładek (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Automatycznie dołącz do tego pokoju po uzyskaniu połączenia"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Pseudonim:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Ostatnio:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Dołącz"
@@ -1480,7 +1556,7 @@ msgstr "Minimalizuj po automatycznym wejściu"
 msgid "Print status:"
 msgstr "Wyświetlaj status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Serwer:"
 
@@ -2019,7 +2095,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sortuj kontakty według statusu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2189,34 +2265,39 @@ msgid "All"
 msgstr "wszystkim"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "według autoryzacji"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Zezwól"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Odmów"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Kolejność:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Poufna Lista"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "według autoryzacji"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "według grupy"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2228,19 +2309,19 @@ msgstr ""
 "od\n"
 "do"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "wysyłać mi wiadomości"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "wysyłać kwerendy"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "wysyłać mi status"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "widzieć mój status"
 
@@ -2408,96 +2489,11 @@ msgstr "Usuń konto z Gajima i z _serwera"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "P_oproś o to, żeby móc widzieć jego/jej status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Dodaj powiadomienia _specjalne..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Przypisz klucz Open_PGP..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Modyfikuj _grupy..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Wykonaj komendę..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "Za_proś do"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "Us_uń"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Wyślij odrębny status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Wyślij _wiadomość..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Wyślij _plik..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Ustaw własny _avatar..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Rozpocznij _rozmowę"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Pozwól mu/jej widzieć swój status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Zabroń mu/jej widzieć twój status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "Ignoruj"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Modyfikuj dane kontaktu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Zmień nazwę..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Autoryzacja"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Cofnij ignorowanie"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2618,7 +2614,7 @@ msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "Informacje o kontakcie"
 
@@ -2832,26 +2828,6 @@ msgstr "Wiado_mość"
 msgid "_Presence"
 msgstr "_Obecność"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Dodaj powiadomienia _specjalne"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Przypisz klucz Open_PGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Modyfikuj _grupy"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Zmień nazwę"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modyfikuj konto..."
@@ -2895,48 +2871,48 @@ msgid "Service returned an error."
 msgstr "Usługa zwróciła komunikat błędu."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Aktywny"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Nieaktywny"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Zmienna logiczna"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Liczba całkowita"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Kolor"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Nazwa opcji"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Wartość"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Brak)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Ukryte"
 
@@ -2950,183 +2926,182 @@ msgstr "Otrzymałeś nowy artykuł:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "angielski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "bułgarski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "bułgarski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "bretoński"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "czeski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "niemiecki"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "grecki"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "brytyjski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "hiszpański"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "baskijski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "francuski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "chorwacki"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "włoski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "norweski (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "holenderski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "norweski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "polski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "portugalski (Brazylia)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "rosyjski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "serbski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "słowacki"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "szwedzki"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "chiński (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Wybierz słownik"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 msgid "Strike"
 msgstr "Przekreślenie"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr "Czcionka:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 msgid "Clear formating"
 msgstr "Usuń formatowanie"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Na pewno wysłać ten plik?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Jeżeli wyślesz plik do %s, pozna on/ona twój pełny JID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "Szyfrowanie GPG włączone"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 msgid "This contact does not support file transfer."
 msgstr "Ten kontakt nie może przesyłać i odbierać plików."
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Ty musisz znać prawdziwy JID kontaktu, aby wysłać jej/jemu plik."
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Nieznany wykonawca"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Nieznany tytuł"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Nieznany album"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3135,17 +3110,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> w wykonaniu <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pokoju %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Nie ma przypisanego klucza GPG"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3153,50 +3128,50 @@ msgstr ""
 "Nie ma klucza GPG przypisanego do tego kontaktu. Więc nie możesz szyfrować "
 "wiadomości do tego kontaktu, używając GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "Szyfrowanie GPG wyłączone"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Sesja BĘDZIE logowana"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Sesja NIE BĘDZIE logowana"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "jest"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "NIE jest"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "będzie"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "NIE będzie"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "oraz autoryzowana"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "oraz NIE autoryzowana"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3205,66 +3180,23 @@ msgstr ""
 "%(type)s szyfrowanie %(status)s aktywne %(authenticated)s.\n"
 "Twoja sesja %(logged)s będzie logowana."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Komenda nie jest wspierana dla konta zeroconf."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Polecenia: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Użycie: /%s czyście okno tekstowe."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Użycie: /%s ukrywa przyciski czatu."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Użycie: /%(command)s <działanie> spowoduje wysłanie działania do aktualnego "
-"pokoju. Używaj w trzeciej osobie. (np. /%(command)s eksploduje.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Brak informacji o pomocy dla /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Negocjowanie sesji zostało przerwane"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr "i BĘDZIE logowana"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr "i NIE BĘDZIE logowana"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3272,25 +3204,25 @@ msgstr ""
 "Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk "
 "tarczy po więcej szczegółów."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "Szyfrowanie E2E wyłączone"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Ta wiadomość NIE została zaszyfrowana"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Ta wiadomość została zaszyfrowana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3298,15 +3230,15 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Błąd bazy danych"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3315,7 +3247,7 @@ msgstr ""
 "Plik (%s) bazy danych nie może zostać odczytany. Spróbuj to naprawić lub "
 "usunąć ten plik (cała historia rozmów będzie usunięta)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ma teraz status %(status)s"
@@ -3324,23 +3256,23 @@ msgstr "%(name)s ma teraz status %(status)s"
 msgid "creating logs database"
 msgstr "tworzenie bazy danych z logami"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s jest plikiem choć powinien być katalogiem"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim zakończy teraz działanie"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jest katalogiem choć powinien być plikiem"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "tworzenie katalogu %s"
@@ -3404,9 +3336,9 @@ msgstr "Wybierz pokoje, które chcesz opuścić"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Pokoje"
 
@@ -3422,73 +3354,114 @@ msgstr "Prześlij dalej nieprzeczytane wiadomości"
 msgid "All unread messages have been forwarded."
 msgstr "Wszystkie nieprzeczytane wiadomości zostały przesłane dalej."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr "Włącz dźwięki, kiedy użytkownik jest zajęty"
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Korzystaj z DBus i Demona Powiadomień aby wyświetlać powiadomienia"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Pokaż tylko połączone i chętne do rozmowy kontakty."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Zaraz wracam z powodu braku aktywności przez $T min.)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas bezczynności"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Status Nieobecny z powodu bezczynności programu powyżej $T min.)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas nieobecności"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Kiedy pokazać ikonę w obszarze powiadomienia. Może być 'nigdy', "
 "'podczas_zdarzenia', 'zawsze'."
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Niepoprawny pseudonim"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "treść informacji o statusie"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Niepoprawny pseudonim"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Zmiana pseudonimu"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "treść informacji o statusie"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (oddzielona spacjami) kolumn (kont lub grup), które są zwinięte."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "domyślny"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Uaktywnij komunikację link-local/zeroconf"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Język używany przez słownik"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3499,7 +3472,7 @@ msgstr ""
 "print_ichat_every_foo_minutes.\n"
 "'never' - nigdy nie wyświetlaj czasu."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3510,18 +3483,18 @@ msgstr ""
 "najmniej dokładne. Ustawienie to brane jest pod uwagę jedynie wtedy, gdy "
 "opcja print_time ustawiona jest na 'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znaków * / _ jako znaki formatujące."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie "
 "pogrubiony ale bez usuniętych znaków * *."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3531,7 +3504,7 @@ msgstr ""
 "zainstalowany pakiet docutils. Wyjaśnienie składni dostępne na stronie "
 "http://docutils.sourceforge.net/docs/ref/rst/"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3539,7 +3512,7 @@ msgstr ""
 "Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko "
 "czat)"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3547,7 +3520,7 @@ msgstr ""
 "Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już "
 "używany przez innego uzytkownika czatu"
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3558,19 +3531,19 @@ msgstr ""
 "minuta] \". Więcej informacji w dokumentacjy Pythona dotyczącą strftime: "
 "http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaki, które wyświetlane są podczas rozmowy przed nazwą użytkownika"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaki, które wyświetlane są podczas rozmowy za nazwą użytkownika"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Dodać * i [n] do tytułu listy kontaktów?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3578,11 +3551,25 @@ msgstr ""
 "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
 "rozmowy zostanie ponownie otwarta."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Ile minut powinny być widoczne linie z poprzedniej rozmowy."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3590,11 +3577,11 @@ msgstr ""
 "Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne "
 "zachowanie klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ile przechwywać linii dla kombinacji Ctrl+KeyUP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3603,13 +3590,13 @@ msgstr ""
 "Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, "
 "co oznacza użycie wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z "
 "wykorzystaniem gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3622,14 +3609,14 @@ msgstr ""
 "synchronizują się ze statusem globalnym) w oparciu o status wykorzystywanego "
 "połączenia sieciowego."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
 "przyjmować wartości all, composing_only, disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3637,7 +3624,7 @@ msgstr ""
 "Informacje o statusie rozmówcy wyświetlane w oknie rozmowy. Przyjmuje "
 "wartości all, composing_only, disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3646,11 +3633,11 @@ msgstr ""
 "(print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać "
 "czas nadejścia nowej wiadomości."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3659,7 +3646,7 @@ msgstr ""
 "na każdym z pokojów wymienionych na liście (nazwy pokojów rozdzielone "
 "spacją)."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3668,7 +3655,7 @@ msgstr ""
 "prowadzona jest na dowolnym pokoju obecnym na tej liście (nazwy pokojów "
 "rozdzielone spacją)."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
@@ -3677,7 +3664,7 @@ msgstr ""
 "pewne dane(rozmowy, prywatne rozmowy, grupowe rozmowy, które nie zostaną "
 "zminimalizowane)"
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3685,27 +3672,27 @@ msgstr ""
 "Oddzielona przecinkami lista hostów, którą wysyłamy w celu przesyłania "
 "plików, w przypadku tłumaczenia adresu/przekierowania portu."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Standard IEC mówi, że KiB = 1024 bajty, KB = 100 bajtów."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Powiadamiaj o zdarzeniach za pomocą ikony w obszarze powiadamiania."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Czy pokazywać rozgraniczenie kart w oknie czatu?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3717,18 +3704,18 @@ msgstr ""
 "16, 17 i 18. Wyższy numery są bardziej bezpiecznie, lecz obliczanie zajmie "
 "więcej czasu podczas rozpoczynania sesji."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista słów oddzielonych średnikami, które będą podświetlane w trakcie "
 "rozmowy w pokoju."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3737,14 +3724,14 @@ msgstr ""
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
 "systemowa."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Jeśli ma wartość True, Gajim sprawdzi przy każdym uruchomieniu czy jest "
 "domyślnym klientem Jabbera."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3753,7 +3740,7 @@ msgstr ""
 "nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
 "motywu."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3761,11 +3748,11 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on "
 "pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Zdefiniuj pozycję avatara na liście kontaktów. Lewo lub prawo"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3773,7 +3760,7 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyśle zapytanie o awatar każdego kontaktu, "
 "który ostatnio nie miał awatara lub ma zapisany jedynie stary."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3781,7 +3768,7 @@ msgstr ""
 "Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub "
 "opisu statusu przez kontakt, z którym rozmawiasz."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3796,30 +3783,30 @@ msgstr ""
 "\"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu "
 "użytkownika do pokoju lub jego opuszczeniu."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Kolor tła dla logujących się kontaktów."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Kolor tła dla kontaktów w trakcie wylogowywania."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Jeżeli opcja ustawiona jest na True, przywrócone wiadomości będą wyświetlane "
 "mniejszą czcionką."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pokazuj awatarów transportów."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pokazuj okna rostera na pasku zadań."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3829,7 +3816,7 @@ msgstr ""
 "niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
 "okna programu."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3840,7 +3827,7 @@ msgstr ""
 "wysyłania takiej informacji."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3861,35 +3848,35 @@ msgstr ""
 "wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
 "uruchomić program."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w "
 "oknie rozmowy."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Ustawienie 'True' spowoduje zamykanie okna/karty rozmowy po naciśnięciu "
 "klawisza ESC."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Ukrywa przyciski w oknie czatu."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Ukrywa banner w oknie czatu"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Usuwa banner podczas rozmowy dwóch osób"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Usuwa z okna rozmowy grupowej listę osób obecnych w pokoju."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3897,15 +3884,15 @@ msgstr ""
 "Podczas rozmowy grupowej, pokaż nazwę rozmówcy na początku linii tylko "
 "wówczas, gdy poprzednią wiadomość wysłała inna osoba."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Wcięcie stosowane przy łaczeniu tych samych nicków."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Płynne przewijanie w oknie rozmowy"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3913,13 +3900,13 @@ msgstr ""
 "Lista kolorów, oddzielonych \":\", które używane będą do kolorowania nicków "
 "w oknach czatu."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Kombinacja klawiszy Ctrl-Tab przechodzi do następnej karty, o ile w żadnej z "
 "nich nie ma nieprzeczytanych wiadomości."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3927,7 +3914,25 @@ msgstr ""
 "Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
 "Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
+"Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
+"Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3938,7 +3943,7 @@ msgstr ""
 "ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego "
 "serwera."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3946,7 +3951,7 @@ msgstr ""
 "Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
 "używał Menedżera bazy kluczy GNOME."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3955,7 +3960,7 @@ msgstr ""
 "Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
 "używał Menedżera bazy kluczy GNOME."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3964,7 +3969,7 @@ msgstr ""
 "połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz "
 "grupy"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3973,7 +3978,7 @@ msgstr ""
 "Gajim będzie traktował każdą przychodzącą wiadomość jako czat lub pojedynczą "
 "wiadomość"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3982,7 +3987,7 @@ msgstr ""
 "kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu "
 "nie jest już otwarte."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3991,13 +3996,13 @@ msgstr ""
 "$$ i $$ do postaci obrazu (z wykorzystaniem dvips) przed wstawieniem ich do "
 "okna rozmowy."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Wymagany jest okres nieaktywności zanim zamknięte zostanie okno zmiany "
 "statusu."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4005,7 +4010,7 @@ msgstr ""
 "Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są "
 "usuwane."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4013,17 +4018,17 @@ msgstr ""
 "Po nadaniu wartości True okna powiadomień będą połączone z obszarem "
 "powiadomień."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Wybierz odstęp czasu pomiędzy dwoma sprawdzeniami bezczynności."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr "Zmień rozmiar pokazywanych formuł latex-a."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4031,7 +4036,7 @@ msgstr ""
 "Wzorce ważnych uri. Tylko wzorce z tej listy będzie przyjmowane jako "
 "\"prawdziwe\" uri. (mailto i xmpp są traktowane oddzielnie)"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
@@ -4041,6 +4046,16 @@ msgstr ""
 "wielu zapytań!"
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4048,7 +4063,7 @@ msgstr ""
 "Priorytet ulegnie automatycznej zmianie, wraz ze zmianą statusu. Priorytety "
 "zdefiniowane są opcjach rozpoczynających się od autopriority_*."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4057,28 +4072,41 @@ msgstr ""
 "rozmowy, zaraz wracam, nieobecny, nie przeszkadzać, niewidoczny. UWAGA: ta "
 "opcja będzie używana tylko jeśli restore_last_status będzie wyłączone"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Jeśli włączone, przywróc ostatni status, który był użyty."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w "
+"oknie rozmowy."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Po wyłączeniu tej opcji, Gajim nie podpisuje komunikatów o stanach kluczem "
 "GPG, nawet jeśli GPG jest skonfigurowany."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Włączono szyfrowanie ESession dla tego konta."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Czy Gajim powinien automatycznie zaczynać zaszyfrowaną sesje jeśli to "
 "możliwe?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4086,30 +4114,30 @@ msgstr ""
 "Lista połączeń (rozdzielona spacjami) zawierająca wykaz rodzajów połączeń. "
 "Może zawierać tls, ssl lub plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Pokaż ostrzeżenie przed użyciem standardowej biblioteki SSL."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 "Lista błędów (rozdzielona spacjami) zawierająca wykaz błędów ssl, które "
 "program będzie ignorował."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr "Wysyłanie białych znaków po nieaktywności"
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr "Wysyłanie pingu XMPP po nieaktywności"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4118,11 +4146,11 @@ msgstr ""
 "połączenie przed podjęciem próby ponownego połączenia."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Obejście dla Jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4130,15 +4158,15 @@ msgstr ""
 "Jeżeli ta opcja jest aktywna, Gajim pobierze adresy serwerów proxy z klucza "
 "file_transfers_proxies i użyje ich podczas przesyłania plików."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Odpowiedź na żądanie potwierdzenia"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Wyślij żądanie potwierdzenia"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4146,11 +4174,11 @@ msgstr ""
 "Czy podczas negocjowania szyfrowanej sesji Gajim ma przyjąć, że chcesz ją "
 "logować?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4158,101 +4186,101 @@ msgstr ""
 "Czy Gajim powinien automatycznie rozpoczynać zaszyfrowana sesję z tym "
 "kontaktem, jeśli to możliwe?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Język, którego używa słownik przy sprawdzaniu pisowni"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "all lub komunikaty stanu rozdzielone spacjami"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' lub 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' lub \""
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4261,98 +4289,98 @@ msgstr ""
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Dźwięk, jaki będzie odtwarzany, gdy nadejdzie wiadomość MUC."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "morski"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Nie można załadować modułu idle"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Błędna nazwa hosta"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Niepoprawny adres lokalny? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informacje rejestracyjne transportu %s nie dotarły na czas"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 msgid "Registration succeeded"
 msgstr "Rejestracja zakończyła się sukcesem"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Rejestracja z %s zakończyła się sukcesem"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 msgid "Registration failed"
 msgstr "Rejestracja nie powiodła się"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Rejestracja z %(agent)s nie powiodła się, błąd %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Błąd zapisu na dysk"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Niewidoczność nie jest obsługiwana"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s nie obsługuje niewidoczności."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Doszła wiadomość od nieprawidłowego JID, będzie zignorowana"
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4362,77 +4390,84 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) lub usuń ten plik(całe archiwum "
 "rozmów zostanie usunięte)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Pseudonim jest niedozwolony: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zostałeś zabanowany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Pokój %s nie istnieje."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Twój pseudonim musi być używany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nie jesteś na liście uczestników rozmów w pokoju %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Pokój został usunięty"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "W zamian możesz dołączyć do pokoju %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4442,223 +4477,209 @@ msgstr ""
 "Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru."
 "jabberstudio.org/ aby go usunąć"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Nie podano klucza OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Nie można uzyskać certyfikatu wystawcy"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Nie można uzyskać CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nie można odszyfrować podpisu certyfikatu"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nie można odszyfrować podpisu CRL"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Nie można odkodować klucza publicznego wystawcy"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Błąd podpisu certyfikatu"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Błąd podpisu CRL"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Certyfikat nie jest prawidłowy"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Certyfikat wygasł"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL nie jest prawidłowy"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL wygasł"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Błąd w polu notBefore certyfikatu"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Błąd w polu notAfter certyfikatu"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Błąd w polu lastUpdate CRL"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Błąd w polu nextUpdate CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Certyfikat podpisany przez wystawcę"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "W łańcuchu certyfikatów znaleziono certyfikat podpisany przez wystawcę"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Nie można pobrać lokalnego certyfikatu wystawcy"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Nie można zweryfikować pierwszego certyfikatu"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Za długi łańcuch certyfikatów"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Niepoprawny certyfikat CA"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Stała długości ścieżki przekroczona"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Nieznany cel certyfikatu"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Certyfikat niezaufany"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Certyfikat odrzucony"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Niezgodność subject/issuer"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Tym kluczem nie można podpisywać certyfikatu"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Błąd weryfikacji aplikacji"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Połącz ponownie ręcznie."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Serwer %(name)s udzielił nieprawidłowej odpowiedzi na żądanie rejestracji: %"
 "(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serwer %s przesłał niezgodny formularz rejestracyjny"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nieznany błąd SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Niepoprawna odpowiedź"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s udzielił nieprawidłowej odpowiedzi na żądanie "
 "rejestracji: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serwer odpowiedział: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Połączenie z serwerem proxy nie powiodło się"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie można połączyć się %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Połączenie z kontem %s zostało zerwane."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Nie można potwierdzić autentyczności certyfikatu %s."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4667,7 +4688,7 @@ msgstr ""
 "\n"
 "Błąd SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4676,24 +4697,24 @@ msgstr ""
 "\n"
 "Nieznany błąd SSL: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Błąd usuwaniu listy prywatności"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4702,32 +4723,32 @@ msgstr ""
 "Lista prywatności %s nie została usunięta. Prawdopodobnie jest aktywna w "
 "jednym z połączonych zasobów. Wyłącz ją i spróbuj ponownie."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Niemożna wysłać wiadomości do %s, JID jest nieprawidłowy."
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 "Komunikat o statusie obecności nie jest podpisany, nie przypisano mu też "
 "klucza."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "Klucz kontaktu (%s) nie pasuje do klucza przypisanego w Gajimie."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ta wiadomość jest zaszyfrowana (Zobacz :XEP: '27']"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4736,30 +4757,41 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Zaproś kontakty"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Rejestracja nie powiodła się"
+
+#: ../src/common/connection.py:1983
+#, fuzzy, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+"Rejestracja z %(agent)s nie powiodła się, błąd %(error)s: %(error_msg)s"
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Obserwatorzy"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transporty"
 
@@ -4768,14 +4800,19 @@ msgid "Not in roster"
 msgstr "Spoza listy kontaktów"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Na tym komputerze brakuje pythonowych dowiązań do D-Bus."
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Nie można użyć D-Bus."
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
@@ -4853,56 +4890,69 @@ msgid "eleven"
 msgstr "jedenasta"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "Godzina %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "pięć po %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "dziesięć po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "kwadrans po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "dwadzieścia po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "za pięć wpół do %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, fuzzy, python-format
 msgid "half past %(0)s"
 msgstr "w pół do %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "pięć po wpół do %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "za dwadzieścia %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "za kwadrans %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "za dziesięć %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "za pięć %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "godzina %(1)s"
 
@@ -4970,190 +5020,190 @@ msgstr "Niepoprawna litera w nazwie hosta."
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Dostępny"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Powiązanie kontaktu z czata: brak"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Właściciel"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "pisze wiadomość..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5161,22 +5211,22 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " z pokoju %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " od użytkownika %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5184,12 +5234,12 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Błąd przy wykonywaniu \"%(command)s\": %(error)s"
@@ -5205,11 +5255,11 @@ msgstr "%s nie jest prawidłowym poziomem logowania"
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyjan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
@@ -5861,7 +5911,7 @@ msgstr ""
 "anulowane."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5869,7 +5919,7 @@ msgstr ""
 "[To jest część zaszyfrowanej wiadomości. Jeżeli widzisz tą wiadomość, "
 "oznacza to, że coś poszło źle.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5878,15 +5928,27 @@ msgstr ""
 "Nazwa hosta %s, którą określiłeś w opcji ft_add_hosts_to_send jest "
 "niepoprawna, będzie więc ignorowana."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Nie podano klucza OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Aby dalej wysyłać i odbierać wiadomości musisz się ponownie połączyć."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Błąd Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5895,31 +5957,31 @@ msgstr ""
 "%s\n"
 "Przesyłanie wiadomości między adresami link-local może nie działać poprawnie."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi lub Bonjour"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Nie można uruchomić usługi lokalnej"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie można podłączyć się do portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Proszę sprawdzić czy uruchomiony jest demon Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie można zmienić statusu konta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5928,20 +5990,20 @@ msgstr ""
 "mogła zostać wysłana."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Twoja wiadomość nie mogła zostać wysłana."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt jest rozłączony. Twoja wiadomość nie mogła zostać wysłana."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5953,24 +6015,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Błąd przy dodawaniu usługi %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Domyśla wiadomość"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5979,212 +6041,218 @@ msgstr ""
 "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
 "inny język korzystać z opcji speller_langugage."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz "
 "zalogować się ponownie."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 msgid "OpenPGP is not usable on this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Posiadasz już konto o tej nazwie. Zmień nazwę konta na unikalną."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Zmień nazwę konta"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Wpisz nową nazwę dla kontaktu %s."
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr ""
 "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Musisz najpierw stworzyć konto by móc edytować informacje o sobie."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Musisz być połączony, aby móc zmieniać informacje o sobie."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6192,11 +6260,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6204,11 +6272,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6216,11 +6284,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6228,7 +6296,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6244,124 +6312,123 @@ msgstr ""
 "4. domena (dotyczy domeny a także dowolnego adresu typu użytkownik@domena,\n"
 "domena/zasób lub adresu zawierającego subdomenę)."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:Żaden"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Upewnij się, że wypełniłeś pola serwer i pokój lub usuń tę zakładkę."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Pseudonim jest niedozwolony: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub "
 "później wybierając pozycję Konta z menu Edycja w głównym oknie programu."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Wpisz adres serwera, na którym chcesz się zarejestrować."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Certyfikat znajduje się już w pliku"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Ten certyfikat znajduje się już w pliku %s, więc nie zostanie ponownie "
 "dodany."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6376,7 +6443,7 @@ msgstr ""
 "Błąd SSL: %(error)s\n"
 "Czy nadal chcesz się połączyć z tym serwerem?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6387,63 +6454,63 @@ msgstr ""
 "Odcisk klucza SHA1 certyfikatu:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Otrzymałeś następną wiadomość"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Otrzymałeś następną wiadomość w tle"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6453,7 +6520,7 @@ msgstr ""
 "odebrana. Jeśli ta ikona zostanie przez długi czas,\n"
 "może oznaczać, że wiadomości została zgubiona."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6461,74 +6528,74 @@ msgstr ""
 "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju\n"
 "od momentu gdy ostatni raz odwiedziłeś/odwiedziłaś ten pokój"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Zakończ"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "W URL-u słownika brakuje \"%s\" i nie jest to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Te JID jest już na liście"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Wprowadzony JID znajduje się już na liście. Wybierz inny."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "nowy@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nowy%d@jabber.id"
@@ -6563,123 +6630,123 @@ msgstr "Nazwa kontaktu"
 msgid "Set Mood"
 msgstr "Ustaw Nastrój"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Opis statusu"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Zmienić opis statusu?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Status o tej nazwie jest w użyciu. Czy chcesz go zmienić?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Szablony opisów"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwę dla tego szablonu"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "_Adres AIM:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "_Adres MSN:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Adres _Yahoo:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać do konta %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Ty nie możesz dodać siebie do swojej listy kontaktów."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "I wreszcie, chcielibyśmy podziękować wszystkim opiekunom pakietów."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Tłumaczenie na język polski: Witold Kieraś\n"
 "Maciej Chojnacki <maciej@chojnacki.name>Sławomir Domagała <godlark@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6691,89 +6758,99 @@ msgstr ""
 "inny język korzystać z opcji speller_langugage.\n"
 "Do tego czasu podświetlanie błędnie wpisanych słów nie będzie działało"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Prośba o autoryzację dla konta %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Niepoprawna nazwa konta"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Wskaż konto, z którym chcesz wejść do pokoju"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie jest nazwą czatu."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Nie możesz synchronizować kontaktów z kontem, które nie jest połączone."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6782,300 +6859,300 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Nie możesz zmienić hasła, jeśli nie jesteś połączony."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Od %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Konsola XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Edytuj"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Grupa"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Kolejność: %(order)s, akcja: %(action)s, typ: %(type)s, wartość: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Kolejność: %(order)s, akcja: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasza cię do rozmowy"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasza cię do pokoju %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Czy chcesz zaakceptować zaproszenie?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "Nr"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "kiedy mam "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7086,19 +7163,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Już zweryfikowałeś tożsamość tego kontaktu."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Tożsamość rozmówcy zweryfikowana"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Ponowna weryfikacja..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7108,19 +7185,19 @@ msgstr ""
 "wiadomości lub wysyłać wiadomości do ciebie, powinieneś zweryfikować ich "
 "tożsamość poprzez kliknięcie przycisku poniżej."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Tożsamość rozmówcy NIE zweryfikowana"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Weryfikowanie..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Czy zweryfikowałeś/zweryfikowałaś tożsamość zdalnego rozmówcy?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7134,23 +7211,23 @@ msgstr ""
 "zobaczy ten sam Short Authentication String (SAS) jak ty.\n"
 "Tej sesji Short Authentication String to <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Czy rozmawiałeś(aś) ze zdalnym rozmówcą i zweryfikowałeś(aś) SAS?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Klucz kontaktu (%s) <b>nie pasuje</b> do klucza przypisanego w Gajimie."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nie ma klucza GPG przypisanego do tego kontaktu. Więc nie możesz szyfrować "
 "wiadomości do niego, używając GPG."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7159,7 +7236,7 @@ msgstr ""
 "klucza</b>, więc wiadomość <b>nie będzie</b> odszyfrowana. Użyj twojego "
 "klienta GPG, aby importować klucz."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7254,20 +7331,20 @@ msgstr "Opis"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Możesz zarządzać zakładkami poprzez menu Działania w oknie kontaktów."
 
@@ -7279,15 +7356,15 @@ msgstr "Zasubskrybowano"
 msgid "Node"
 msgstr "Węzeł"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Nowy wpis"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Cofnij autoryzację"
 
@@ -7732,31 +7809,31 @@ msgstr "Gajim wymaga do działania serwera X. Zamykanie programu..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim wymaga PyGTK w wersji 2.12 lub wyższej"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Gajim wymaga do działania PyGTK w wersji 2.12 lub wyższej. Zamykanie "
 "programu..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim wymaga GTK w wersji 2.12 lub wyższej"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Gajim wymaga do działania GTK w wersji 2.12 lub wyższej. Zamykanie "
 "programu..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "W GTK+ brakuje wsparcia dla libglade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7764,22 +7841,22 @@ msgid ""
 msgstr ""
 "Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Sprawdź, czy GTK+ oraz PyGTK posiadają w twoim systemie wsparcie dla "
 "libglade."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim wymaga do działania PySQLite2"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim wymaga do działania pakietu pywin32"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7789,11 +7866,11 @@ msgstr ""
 "spod adresu %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim jest już uruchomiony"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7801,35 +7878,35 @@ msgstr ""
 "Wydaje się, że w tle działa już inna kopia Gajima.\n"
 "Czy mimo to chcesz uruchomić program?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Wprowadź hasło dla klucza GPG %(keyid)s (konto %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr "Klucz GPG stracił ważność"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Twój klucz GPG stracił ważność, zostaniesz połączony z %s bez OpenGPG"
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7840,58 +7917,58 @@ msgstr ""
 "innego w pokoju %s.\n"
 "Podaj inny pseudonim:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Czy akceptujesz tę prośbę?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Czy akceptujesz tę prośbę na koncie %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autoryzacja HTTP (%(method)s) dla %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Połączenie nie powiodło się"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Błąd %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 msgid "Subscription request"
 msgstr "Prośba o autoryzację"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7899,76 +7976,76 @@ msgstr ""
 "Zawsze będziesz widział ten kontakt jako rozłączony.\n"
 "Czy chcesz go usunąć z listy kontaktów?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 msgid "Unsubscribed"
 msgstr "Cofnij autoryzację"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s występuje teraz jako %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ma teraz status %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s ustawił temat na %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Lista zawiera teraz niedostępnych uczestników"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "lista nie zawiera teraz niedostępnych użytkowników"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Nastąpiła zmiana konfiguracji pokoju (nie powiązana z prywatnością)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Pokój nie jest już anonimowy"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Pokój jest teraz quasi-anonimowy"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Aby dołączyć do pokoju %s wymagane jest hasło. Proszę je wpisać"
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7976,19 +8053,24 @@ msgstr ""
 "Skonfigurowałeś Gajima by używał agenta GPG, ale agent nie jest uruchomiony "
 "lub zwraca błędne hasło.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Twoje hasło jest niepoprawne"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr "GPG nie jest zaufany"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -7996,13 +8078,14 @@ msgstr ""
 "Klucz GPG używany do szyfrowania tej rozmowy nie jest zaufany. Czyn naprawdę "
 "chcesz zaszyfrować tą wiadomość?"
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
@@ -8011,12 +8094,12 @@ msgstr ""
 "\tprawidłowo uruchomiony(zmienna środowiskowa prawdopodobnie nie jest \t\t\t"
 "\t właściwie ustawiona)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8024,7 +8107,7 @@ msgstr[0] "Masz %d nieprzeczytaną wiadomość pocztową"
 msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe"
 msgstr[2] "Masz %d nieprzeczytane wiadomości pocztowe"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8039,44 +8122,44 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Błąd odczytu pliku:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Otrzymałeś plik %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Przesłałeś plik %(filename)s do %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8085,36 +8168,36 @@ msgstr ""
 "Nie można odszyfrować wiadomości od %s\n"
 "To mogło być sfałszowane."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Nie można odszyfrować wiadomości"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Konflikt nazw użytkownika"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Błąd."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Konflikt zasobów"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8122,11 +8205,11 @@ msgstr ""
 "Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę "
 "podać nowy zasób"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Błąd podczas weryfikacji certyfikatu SSL"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8137,15 +8220,15 @@ msgstr ""
 "s\n"
 "Czy ciagle chcesz się połączyć z serwerem?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignoruj komunikat o tym błędzie."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Błąd certyfikatu SSL"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8162,11 +8245,11 @@ msgstr ""
 "\n"
 "Czy nadal chcesz połączyć się i zaktualizować odcisk klucza certyfikatu?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Niezabezpieczone połączenie"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8174,11 +8257,11 @@ msgstr ""
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie.Czy jesteś "
 "pewien?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8186,21 +8269,21 @@ msgstr ""
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. "
 "Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "Węzeł PEP nie został usunięty"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Węzeł PEP %(node)s nie został usunięty: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Emotoikony wyłączone"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8208,7 +8291,7 @@ msgstr ""
 "Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą "
 "wyłączone."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8218,13 +8301,13 @@ msgstr ""
 "potrzebować aktualizacji  formatu pliku emoticons.file. Aby poznać więcej "
 "szczegółów, zobacz http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji"
 
@@ -8258,12 +8341,13 @@ msgstr ""
 "osobnej linii"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "konto"
 
@@ -8290,9 +8374,9 @@ msgstr ""
 "jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, "
 "zajęty, niewidoczny "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "wiadomość"
 
@@ -8310,23 +8394,48 @@ msgstr ""
 "statusem globalnym"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Zmienia status kont lub kont"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priory_tet:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Chcę za_rejestrować nowe konto Jabbera"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"zmień status konta \"konto\". Jeśli nie jest on określony, to spróbuj "
+"zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
+"statusem globalnym"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Pokazuje okno dialogowe umożliwiające wysłanie wiadomości do kontaktu"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID osoby, z którą chcesz porozmawiać"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8336,30 +8445,30 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "klucz pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "jeśli jest podane, to wiadomość zostanie wysłana z tego konta"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8369,133 +8478,133 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "temat"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "temat wiadomości"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Wysyła nową wiadomość na czat, w którym uczestniczysz."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID pokoju, do którego zostanie wysłana wiadomość"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Pobiera szczegółowe informacje o koncie"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Nazwa konta"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Wysyła plik kontaktowi"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "plik"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "plik zostanie wysłany z tego konta, jeśli jest ono podane"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Wypisuje wszystkie opcje i ich wartości"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ustawia wartość 'klucza' na 'wartość'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klucz' jest nazwą opcji, 'wartość' zaś jest jej ustawianą wartością"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Usuwa opcję"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "klucz"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nazwa opcji do usunięcia"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje obecny stan opcji Gajima do pliku .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt do listy kontaktów"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Dodaje nowy kontakt do tego konta"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba, że zostało wskazane konto)."
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba że zostało wskazane konto)."
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Zwraca liczbę nieprzeczytanych wiadomości"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otwiera okno dialogowe 'Rozpocznij rozmowę'"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Rozpocznij rozmowę z tego konta"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Wysyła własny XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML do wysłania"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8503,72 +8612,72 @@ msgstr ""
 "Konto, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle "
 "dane do wszystkich kont"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Obsługuj URI xmpp:/"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI do obsługi"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "zawartość wiadomości"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Dołącz do nowego pokoju"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "pokój"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "Pokój:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Nick"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "hasło"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Hasło do pokoju"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Wskaż konto, z którym chcesz wejść do pokoju"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Proszę sprawdzić czy Gajim jest uruchomiony."
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Pokazuje lub ukrywa okno iptyhon"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8577,15 +8686,15 @@ msgstr ""
 "'%s' nie znajduje się na twojej liście kontaktów.\n"
 "Podaj konto, na które ma zostać wysłana ta wiadomość."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim nie jest uruchomiony, nie możesz więc użyć gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8594,16 +8703,16 @@ msgstr ""
 "Użyto: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8612,7 +8721,7 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8621,7 +8730,7 @@ msgstr ""
 "Za dużo argumentów. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8630,7 +8739,7 @@ msgstr ""
 "Argument \"%(arg)s\" nie jest określony. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Błędny adres URI"
 
@@ -8659,288 +8768,154 @@ msgstr "Nie możesz skasować obecnie używanego motywu"
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Nie jesteś już w pokoju \"%(room)s\" lub \"%(nick)s\" opuścił go."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Rozmowa z"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Kontynuacja rozmowy"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 "Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s został zabanowany przez %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s został wyrzucony z pokoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "afiliacja została zmieniona "
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "zamknięcie systemu"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Grupa użytkownika %(nick)s została ustawiona na %(affiliation)s przez %"
 "(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Grupa użytkownika %(nick)s została ustawiona na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 "** Uprawnienia użytkownika %(nick)s zostały zmieniona na %(role)s przez %"
 "(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uprawnienia użytkownika %(nick)s została zmienione na %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Pseudonim nie został odnaleziony: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Ten pokój nie ma tematu"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Pseudonim nie został odnaleziony: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Użycie: /%s <pseudonim|JID> [powód] banuje JID w pokoju. Pseudonim osoby "
-"może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w "
-"pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr "Użycie: /%s <pseudonim>, otwiera okno prywatnej rozmowy z tą osobą."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli "
-"został podany."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
-"wyświetlając powód."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do "
-"pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z "
-"pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
-"wysyła ją do osoby o takim pseudonimie."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Użycie: /%s <wiadomość> wysyła wiadomość bez sprawdzania innych poleceń."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Jeśli zamkniesz to okno, połączenie z tym pokojem zostanie zerwane."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Usuwam pokój %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8948,22 +8923,22 @@ msgstr ""
 "Zamierzasz całkowicie usunąć ten pokój. \n"
 "Poniżej możesz podać powód swojej decyzji:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -9038,6 +9013,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Zapisz plik jako..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Nowa rozmowa grupowa"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Chciałbym dodać Cię do listy kontaktów"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Nie można odnaleźć bazy danych z historią rozmów"
@@ -9123,50 +9106,60 @@ msgstr "Historia rozmowy z %s"
 msgid "Disk Error"
 msgstr "Błąd zapisu lub odczytu na dysku"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s jes teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Komunikat błędu: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Błąd."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Obecny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Przekroczono czas ładowania obrazu"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Obraz jest za duży"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Ty zamierzasz zamknąć wszystkie zakładki"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Czy na pewno chcesz zamknąć wszystkie?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Rozmowy"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Czaty"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Wiadomości"
 
@@ -9226,18 +9219,18 @@ msgstr "Ignoruj"
 msgid "Retrieving profile..."
 msgstr "Pobieranie profilu..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Plik jest pusty"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Plik nie istnieje."
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
@@ -9269,48 +9262,48 @@ msgstr ""
 "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
 "później."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
 "status."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Teraz \"%s\" zawsze będzie cię widział jako rozłączonego."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG nie nadaje się do użycia"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9318,28 +9311,28 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "rozsynchronizowany"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9347,16 +9340,16 @@ msgstr ""
 "Wiadomości będą dostępne do odczytania ich później, tylko wtedy, gdy masz "
 "włączoną obsługę historii."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9364,11 +9357,11 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "tego transportu."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9377,58 +9370,69 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "następujących transportów: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwę dla kontaktu %s."
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nową nazwę dla grupy %s."
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Czy chcesz usunąć z rostera grupę %s?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Usuń z rostera wszystkie kontakty należące do tej grupy"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" zostanie usunięty z Twojej listy kontaktów"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Ty zamierzasz usunąć \"%(name)s\" (%(jid)s) ze swojej listy kontaktów.\n"
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9437,11 +9441,11 @@ msgstr ""
 "będzie zawsze widział Cię jako rozłączonego."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Czy chcesz kontynuować?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9449,16 +9453,16 @@ msgstr ""
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Chcę żeby po usunięciu ten kontakt znał mój status"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9468,19 +9472,32 @@ msgstr ""
 "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
 "jako rozłączony."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Aby rozmawiać z innymi osobami musisz założyć konto Jabbera."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9488,12 +9505,12 @@ msgstr ""
 "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
 "zostanie przywrócona podczas następnego połączenia."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9503,11 +9520,11 @@ msgstr ""
 "rostera. Używa się ich przede wszystkim wtedy, gdy jedna osoba ma kilka kont "
 "Jabbera lub zarejestrowana jest w kilku transportach."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9515,12 +9532,12 @@ msgstr[0] "Czy chcesz wysłać ten plik do %s:"
 msgstr[1] "Czy chcesz wysłać te pliki do %s:"
 msgstr[2] "Czy chcesz wysłać te pliki do %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Wyślij %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Przekształć %s oraz %s w metakontakty"
@@ -9530,115 +9547,127 @@ msgstr "Przekształć %s oraz %s w metakontakty"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Zarządzaj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "_Publikuj Utwór"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Konfiguruj Usługi..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Chciałbym dodać Cię do listy kontaktów"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Zarządzaj kontaktami"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Modyfikuj _grupy"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Wyślij wiadomość"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Wykonaj komendę..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Zarządzaj transportami"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Zmień nazwę"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Rozłącz"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Nowa rozmowa grupowa"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Rozłącz"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Zmień opis statusu..."
 
@@ -9655,20 +9684,20 @@ msgstr "Błąd w odebranych danych"
 msgid "No result"
 msgstr "Brak wyników"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Błąd zapisu na dysk"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Temat: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Potwierdź opcje sesji"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9684,7 +9713,7 @@ msgstr ""
 "\n"
 "\t\tCzy akceptujesz te ustawienia?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9878,6 +9907,130 @@ msgstr "Nie ma oczekujących żądań autoryzacji."
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Dodaj powiadomienia _specjalne"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Przypisz klucz Open_PGP"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Komenda nie jest wspierana dla konta zeroconf."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Polecenia: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Użycie: /%s czyście okno tekstowe."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Użycie: /%s ukrywa przyciski czatu."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Użycie: /%(command)s <działanie> spowoduje wysłanie działania do "
+#~ "aktualnego pokoju. Używaj w trzeciej osobie. (np. /%(command)s "
+#~ "eksploduje.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Brak informacji o pomocy dla /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Uaktywnij komunikację link-local/zeroconf"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Pseudonim nie został odnaleziony: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Ten pokój nie ma tematu"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Pseudonim nie został odnaleziony: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Użycie: /%s <pseudonim|JID> [powód] banuje JID w pokoju. Pseudonim osoby "
+#~ "może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w "
+#~ "pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr "Użycie: /%s <pseudonim>, otwiera okno prywatnej rozmowy z tą osobą."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, "
+#~ "jeśli został podany."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
+#~ "wyświetlając powód."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do "
+#~ "pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z "
+#~ "pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
+#~ "wysyła ją do osoby o takim pseudonimie."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Użycie: /%s <wiadomość> wysyła wiadomość bez sprawdzania innych poleceń."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
+
 #~ msgid "B_OSH Port:"
 #~ msgstr "B_OSH Port:"
 
diff --git a/po/pt.po b/po/pt.po
index 72dc91a7f..fda6700d6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -219,6 +219,7 @@ msgstr "<b>Detalhes Pessoais</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Conta"
 
@@ -287,8 +288,8 @@ msgstr "Editar Detalhes Pessoais..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -299,8 +300,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Geral"
 
@@ -358,25 +359,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informações sobre si, tal como estão gravadas no servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Nenhum"
 
@@ -535,8 +532,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -552,7 +549,7 @@ msgid "Mer_ge accounts"
 msgstr "_Fundir contas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Re_nomear"
 
@@ -828,7 +825,7 @@ msgid "All statuses"
 msgstr "Estado: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Ausente"
 
@@ -846,7 +843,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -856,7 +853,7 @@ msgid "Launch a command"
 msgstr "comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Indisponível"
 
@@ -1049,7 +1046,7 @@ msgid "Join _Group Chat"
 msgstr "_Entrar num Chat"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "_Adicionar à Lista"
@@ -1076,65 +1073,158 @@ msgstr "_Abrir Link no Navegador"
 msgid "_Start Chat"
 msgstr "_Iniciar Conversa"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "Invisível"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Servidor"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+#, fuzzy
+msgid "A_sk to see his/her status"
+msgstr "Pedir para ver o estado dele/dela"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "<b>Notificações Visuais</b>"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Atribuir chave OpenPGP"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "comando"
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Editar _Grupos"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Contacto:"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Remover"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Pedir para ver o estado dele/dela"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+#, fuzzy
+msgid "Send Single _Message..."
+msgstr "Enviar _Mensagem Simples"
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "Enviar _Ficheiro"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Iniciar _Conversa"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Activar/Desactivar Encriptação Open_PGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Activar/Desactivar Encriptação Open_PGP"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Adicionar à Lista"
+#: ../data/glade/contact_context_menu.glade.h:17
+#, fuzzy
+msgid "_Allow him/her to see my status"
+msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:19
+#, fuzzy
+msgid "_Forbid him/her to see my status"
+msgstr "Proibí-lo /-la de ver o meu estado"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "Invisível"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "Servidor"
+msgid "_Manage Contact"
+msgstr "Contacto:"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Renomear"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Subscrição"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "_Continuar"
+
 #: ../data/glade/data_form_window.glade.h:1
 #, fuzzy
 msgid "Fill in the form."
@@ -1263,7 +1353,7 @@ msgstr ""
 "Contacto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Negrito"
 
@@ -1289,7 +1379,7 @@ msgstr "Nenhum"
 msgid "Inactive"
 msgstr "Activo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Itálico"
 
@@ -1364,6 +1454,14 @@ msgstr "Mo_derador"
 msgid "Occupant Actions"
 msgstr "Acções de _Ocupantes"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Enviar _Ficheiro"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Adicionar à Lista"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1372,13 +1470,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Expulsar"
@@ -1395,13 +1486,6 @@ msgstr "_Dono"
 msgid "_Send Private Message"
 msgstr "E_nviar Mensagem Privada"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voz"
@@ -1410,7 +1494,7 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "De"
 
@@ -1432,8 +1516,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 #, fuzzy
 msgid "Delete"
 msgstr "Apagar MOTD"
@@ -1481,35 +1565,40 @@ msgstr "_Pesquisar"
 msgid "_Log conversation history"
 msgstr "_Histórico das Conversas"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Adicionar esta Sala aos _Bookmarks"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 #, fuzzy
 msgid "Join this room automatically when I connect"
 msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Alcunha:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Entrar"
@@ -1539,7 +1628,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Mostrar hora:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -2092,7 +2181,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estados"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Estado"
 
@@ -2274,38 +2363,43 @@ msgid "All"
 msgstr ""
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "_Subscrição"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Negar"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 #, fuzzy
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Subscrição"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 #, fuzzy
 msgid "all in the group"
 msgstr "Neste grupo"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2313,21 +2407,21 @@ msgid ""
 "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 #, fuzzy
 msgid "to send me messages"
 msgstr "Enviar mensagem"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 #, fuzzy
 msgid "to send me status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 #, fuzzy
 msgid "to view my status"
 msgstr "Permitir que ele/ela veja o meu estado"
@@ -2521,109 +2615,11 @@ msgstr "Remover conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-#, fuzzy
-msgid "A_sk to see his/her status"
-msgstr "Pedir para ver o estado dele/dela"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "<b>Notificações Visuais</b>"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Atribuir chave OpenPGP"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "Editar _Grupos"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr ""
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "_Remover"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "Pedir para ver o estado dele/dela"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-#, fuzzy
-msgid "Send Single _Message..."
-msgstr "Enviar _Mensagem Simples"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "Enviar _Ficheiro"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Iniciar _Conversa"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#, fuzzy
-msgid "_Allow him/her to see my status"
-msgstr "Permitir que ele/ela veja o meu estado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Forbid him/her to see my status"
-msgstr "Proibí-lo /-la de ver o meu estado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "Contacto:"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Renomear"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Subscrição"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "_Continuar"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2756,7 +2752,7 @@ msgid "_Add contact"
 msgstr "Adicionar _Contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "Informações do Contacto"
@@ -2988,27 +2984,6 @@ msgstr "_Mensagem"
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-#, fuzzy
-msgid "Add Special _Notification"
-msgstr "<b>Notificações Visuais</b>"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Atribuir chave OpenPGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Editar _Grupos"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Renomear"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Modificar Conta..."
@@ -3054,51 +3029,51 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Activated"
 msgstr "Activo"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Deactivated"
 msgstr "Activo"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Integer"
 msgstr "Neste grupo"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Nome Preferencial"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Escondida"
 
@@ -3112,259 +3087,258 @@ msgstr ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "German"
 msgstr "Geral"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Greek"
 msgstr "green"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Croatian"
 msgstr "Morada"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Italian"
 msgstr "Itálico"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Polish"
 msgstr "_Publicar"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Serbian"
 msgstr "Geral"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Sublinhar"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Serviço"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "Letra:"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informações do Contacto"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Encriptação activada"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar autenticação"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar autenticação"
@@ -3372,101 +3346,58 @@ msgstr "Usar autenticação"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Comandos: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uso: /%s, limpa a janela de texto."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, fuzzy, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uso: /%s, limpa a janela de texto."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
-"pessoa. (Por exemplo, /%s explode.)"
-
-#: ../src/chat_control.py:1777
-#, fuzzy, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Uso: /%s, muda a janela de chat para o modo compacto."
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Uso: /%s, limpa a janela de texto."
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Não há informações de ajuda para /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3474,22 +3405,22 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
@@ -3498,23 +3429,23 @@ msgstr "%(nick)s está agora %(status)s"
 msgid "creating logs database"
 msgstr "a criar base de dados dos logs"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é um ficheiro, mas deveria ser um directório"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim irá agora sair"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é um directório, mas deveria ser um ficheiro"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "a criar directório %s"
@@ -3585,9 +3516,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 #, fuzzy
 msgid "Groupchats"
 msgstr "Chat"
@@ -3606,134 +3537,175 @@ msgstr "Gajim - %d mensagem não lida"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo, em minutos, após o qual o seu estado muda para Ausente."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ausente por estar inactivo"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo, em minutos, após o qual o seu estado muda para Indisponível."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Indisponível por estar inactivo"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Nome de utilizador inválido"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "texto da mensagem de estado"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Nome de utilizador inválido"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Mudar Alcunha"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "texto da mensagem de estado"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "Apagar MOTD"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se Verdadeiro (True), não remover */_ . Para que *abc* fique em negrito "
 "(bold) mas * * não seja removido."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista de contactos?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3741,12 +3713,26 @@ msgstr ""
 "Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
 "de conversa seja reaberta."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Número de minutos que as últimas linhas da conversa anterior devem durar."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3754,11 +3740,11 @@ msgstr ""
 "Enviar mensagem ao premir Ctrl+Enter e fazer nova linha com Enter "
 "(Comportamento por defeito do cliente ICQ Mirabilis)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Número de linhas a guardar ao premir Ctrl+TeclaCIMA."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3767,11 +3753,11 @@ msgstr ""
 "Ou um endereço URL personalizado contendo %s, onde %s é a palavra ou frase, "
 "ou 'WIKTIONARY', que significa que será usado o Wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se marcado, Gajim pode ser controlado à distância usando gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3779,48 +3765,48 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3829,28 +3815,28 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "O standart IEC diz: KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda da aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3858,12 +3844,12 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
@@ -3871,7 +3857,7 @@ msgstr ""
 "Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
 "num chat de vários utilizadores."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3879,13 +3865,13 @@ msgstr ""
 "Se Verdadeiro (True), sai do Gajim quando o botão X do Window Manager for "
 "clicado. Esta definição só será aplicada se o trayicon estiver a ser usado."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Se Verdadeiro (True), Gajim registará para xmpp:// a cada arranque."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3893,7 +3879,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim mostrará um ícone em cada aba contendo mensagens "
 "não lidas. Dependendo do tema, este ícone poderá ser animado."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -3902,11 +3888,11 @@ msgstr ""
 "Se Verdadeiro (True), Gajim exibirá a mensagem de estado, caso houver, de "
 "cada contacto debaixo do nome de cada um deles na lista"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3914,7 +3900,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim perguntará por um avatar a cada contacto que não "
 "tinha um da última vez ou tenha um na memória cache há demasiado tempo."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3923,7 +3909,7 @@ msgstr ""
 "Se Falso (False), deixará de ver a linha de estados em conversas quando um "
 "contacto mudar de estado ou de mensagem de estado."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3932,35 +3918,35 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3968,7 +3954,7 @@ msgid ""
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3980,49 +3966,49 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 msgstr ""
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4031,294 +4017,326 @@ msgstr ""
 "Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
 "num chat de vários utilizadores."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "A trabalhar"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para conversar"
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4327,181 +4345,188 @@ msgstr ""
 "Som a tocar quando uma mensagem de chat conter uma das palavras da lista "
 "muc_highlight_words, or quando uma mensagem conter a sua alcunha."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, fuzzy
 msgid "Wrong host"
 msgstr "Frase de acesso"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informação de registo para o transport %s não chegou a tempo"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Publicação vCard deu-se com sucesso"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alcunha não encontrada: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Está banido/a desta sala."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Criação de salas encontra-se restrita."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "A sua alcunha registada tem de ser usada."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Não está na lista de membros."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Autorização foi removida"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "pedido de remoção de subscrição por %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "já não estamos subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4511,286 +4536,272 @@ msgstr ""
 "ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
 "org/ para o remover."
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Palavra-chave do OpenPGP não foi recebida"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "O utilizador será ligado a %s sem OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Senha Inválida"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Verifique a sua ligação ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Guardado em: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Ligação"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Verifique a sua ligação ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique se o seu login e senha estão correctos."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "erro ao enviar"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4799,31 +4810,41 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contacto:"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr ""
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Publicação vCard falhou"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transportes"
 
@@ -4833,14 +4854,19 @@ msgid "Not in roster"
 msgstr "Fora da lista"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Bindings do python D-Bus estão em falta neste computador"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
@@ -4922,66 +4948,69 @@ msgid "eleven"
 msgstr "Apagar MOTD"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr ""
 
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy
+#, fuzzy, python-format
 msgid "five past %(0)s"
 msgstr "Registar para %s"
 
 #: ../src/common/fuzzyclock.py:44
-#, fuzzy
+#, fuzzy, python-format
 msgid "ten past %(0)s"
 msgstr "Registar para %s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy
+#, fuzzy, python-format
 msgid "quarter past %(0)s"
 msgstr "Registar para %s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty past %(0)s"
 msgstr "Registar para %s"
 
 #: ../src/common/fuzzyclock.py:45
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty five past %(0)s"
 msgstr "Registar para %s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr ""
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty five to %(1)s"
 msgstr "Registar para %s"
 
 #: ../src/common/fuzzyclock.py:46
-#, fuzzy
+#, fuzzy, python-format
 msgid "twenty to %(1)s"
 msgstr "Registar para %s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy
+#, fuzzy, python-format
 msgid "quarter to %(1)s"
 msgstr "Registar para %s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy
+#, fuzzy, python-format
 msgid "ten to %(1)s"
 msgstr "Registar para %s"
 
 #: ../src/common/fuzzyclock.py:47
-#, fuzzy
+#, fuzzy, python-format
 msgid "five to %(1)s"
 msgstr "Registar para %s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr ""
 
@@ -5052,228 +5081,228 @@ msgstr "Caractere inválido no hostname."
 msgid "Invalid character in resource."
 msgstr "Caractere inválido no recurso."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Disponível"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Ligando"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "In_visível"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "Contém erros"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Nenhuma"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Nenhum"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 #, fuzzy
 msgid "Owner"
 msgstr "_Dono"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "está a escrever uma mensagem..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar mensagem"
 msgstr[1] "Enviar mensagem"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5289,11 +5318,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "a criar base de dados dos logs"
@@ -6009,81 +6038,93 @@ msgid ""
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Palavra-chave do OpenPGP não foi recebida"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "O utilizador será ligado a %s sem OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar a enviar e receber mensagens, precisará de se reconectar."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr ""
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6094,285 +6135,291 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "erro ao enviar"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "Gerir Contas"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Deve primeiro criar sua conta antes de editar suas informações"
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sem ligação, não lhe é possível editar as suas informações pessoais."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr "Deve primeiro criar sua conta antes de editar suas informações"
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Para mudar o nome da conta, deve estar disconectado."
+
+#: ../src/config.py:2289
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6382,62 +6429,62 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6445,71 +6492,69 @@ msgstr ""
 "bookmark"
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Pode ajustar opções de conta avançadas clicando no botão Avançadas, ou mais "
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6519,7 +6564,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6527,77 +6572,77 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nome do Contacto"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto Entrou"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensagem"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Convite Recebido"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6606,75 +6651,75 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde que prestou atenção a este "
 "chat pela última vez."
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Sair"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta um \"%s\" no URL do Dicionário e como tal não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "Há %i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de IM Jabber"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6710,131 +6755,131 @@ msgstr "Nome do Contacto"
 msgid "Set Mood"
 msgstr "Definir MOTD"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Complemento:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor preencha os dados do contacto que deseja adicionar na conta %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 #, fuzzy
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Um cliente Jabber GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6843,94 +6888,104 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Pedido de subscrição para a conta %s por parte de %s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Já está na sala %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Nome de conta inválido"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6940,312 +6995,312 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível escrever ficheiro em %s"
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Endereço"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Descrição: %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está banido/a desta sala."
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 #, fuzzy
 msgid "Condition"
 msgstr "Ligação"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7253,38 +7308,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7294,26 +7349,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7408,20 +7463,20 @@ msgstr "Descrição"
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Bookmark já está configurado"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos seus bookmarks."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Pode gerir os seus bookmarks pelo menu de Acções na sua janela."
 
@@ -7434,15 +7489,15 @@ msgstr "Subscrição"
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Subscrever"
@@ -7886,33 +7941,33 @@ msgstr "Gajim necesita do Xserver para ser executado. Saindo..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim necessita do PyGTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do PyGTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim necessita do GTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do GTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Falta suporte libglade para o runtime GTK+"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7921,7 +7976,7 @@ msgstr ""
 "Por favor remova o seu runtime GTK+ actual e instale a última versão estável "
 "de %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -7929,16 +7984,16 @@ msgstr ""
 "Por favor, certifique-se de que o GTK e o PyGTK têm suporte libglade no seu "
 "sistema."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7946,45 +8001,45 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "O utilizador será ligado a %s sem OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7994,185 +8049,191 @@ msgstr ""
 "A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
 "Por favor, introduza outra alcunha em baixo:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorização para %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Ligação"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Introduza a sua mensagem :"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Pedido de Subscrição"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contacto \"%s\" autorizou-o a ver o seu estado."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Subscrever"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "É necessária uma palavra-passe para esta sala."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "A sua chave de acesso está incorrecta"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Não voltar a perguntar"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Tem mensagens não lidas"
 msgstr[1] "Tem mensagens não lidas"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8182,94 +8243,94 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Remove o contacto da lista"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Enviou com sucesso %(filename)s para %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 #, fuzzy
 msgid "Error."
 msgstr "Erro:"
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Recurso: "
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8277,15 +8338,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8296,64 +8357,64 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Ligação"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Não pode entrar numa sala quando está invisível"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
@@ -8390,12 +8451,13 @@ msgstr ""
 "linha separada"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "conta"
 
@@ -8422,9 +8484,9 @@ msgstr ""
 "um de: offline, disponível, livre para conversar, ausente, indisponível, "
 "ocupado, invisível"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "mensagem"
 
@@ -8442,24 +8504,49 @@ msgstr ""
 "activada"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Muda o estado de uma ou várias contas"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "_Prioridade"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Quero _registar uma nova conta"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"mudar estado da conta \"account\". Se não especificado, tentará mudar o "
+"estado de todas as contas que têm a opção \"sincronizar com estado global\" "
+"activada"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Mostra uma caixa de conversa para que possa enviar mensagens a um contacto"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto com quem deseja conversar"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se especificado, o contacto é escolhido da lista de contactos desta conta"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8470,29 +8557,29 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se especificado, a mensagem será encriptada usando esta chave pública"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8503,119 +8590,119 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "subject"
 msgstr "Assunto:"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 #, fuzzy
 msgid "message subject"
 msgstr "Mensagem"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 #, fuzzy
 msgid "Name of the account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "Ficheiro"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Localização do ficheiro"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Exibe todas as preferências e os seus valores"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'chave' para 'valor'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chave' é o nome da preferência, 'valor' é o valor da qual se pretende "
 "definir"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Apaga um item das preferências"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a apagar"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escreve o estado actual das preferências do Gajim para o ficheiro .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Adiciona o contacto à lista"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Adiciona um novo contacto nesta conta."
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
@@ -8623,109 +8710,109 @@ msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 #, fuzzy
 msgid "XML to send"
 msgstr "Consola XML"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Juntar-se a uma Nova Sala"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "Sala:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "nick"
 msgstr "_Expulsar"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "password"
 msgstr "Senha:"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "As senhas não conferem"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8734,31 +8821,31 @@ msgstr ""
 "'%s' não está na sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem"
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8767,7 +8854,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um de:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8776,7 +8863,7 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8785,7 +8872,7 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Frase de acesso"
@@ -8816,313 +8903,176 @@ msgstr "Não pode apagar o seu tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Já não se encontra na sala \"%s\" ou \"%s\" saiu."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "Histórico das Conversas"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Ligação"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Filiação: "
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Alcunha não encontrada: %s"
-
-#: ../src/groupchat_control.py:1530
-#, fuzzy
-msgid "This group chat has no subject"
-msgstr "Esta sala não tem assunto"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Alcunha não encontrada: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Uso: /%s <alcunha|JID> [razão], bane o JID da sala. A alcunha de um ocupante "
-"pode ser substituida, mas não se conter \"@\". Se o JID estiver neste "
-"momento na sala, este será também expulso. Não suporta espaços numa alcunha."
-
-#: ../src/groupchat_control.py:1734
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
-"especificado."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Uso: /%s [razão], fecha a janela ou aba actual, exibindo a razão se "
-"especificada."
-
-#: ../src/groupchat_control.py:1746
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Uso: /%s <JID> [razão], convida o JID para a sala actual, fornecendo "
-"opcionalmente uma razão."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Uso: /%s <sala>@<servidor>[/alcunha], convida a juntar-se a sala@servidor, "
-"usando opcionalmente uma alcunha especificada."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Uso: /%s <alcunha> [razão], remove o ocupante especificado pela alcunha da "
-"sala e opcionalmente exibe uma razão. Não suporta espaços na alcunha."
-
-#: ../src/groupchat_control.py:1762
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Uso: /%s <alcunha> [mensagem], abre uma janela de mensagem privada e envia "
-"uma mensagem ao ocupante da sala especificado pela alcunha."
-
-#: ../src/groupchat_control.py:1767
-#, fuzzy, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
-
-#: ../src/groupchat_control.py:1771
-#, fuzzy, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
-
-#: ../src/groupchat_control.py:1775
-#, fuzzy, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Uso: /%s <message>, envia uma mensagem sem procurar por outros comandos."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Tem a certeza de que deseja sair da sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se fechar esta janela, perder-se-á a ligação a esta sala."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrição: %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -9197,6 +9147,15 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Guardar Ficheiro como..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Chat"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Eu gostaria de o adicionar à minha lista"
+
 #: ../src/history_manager.py:121
 #, fuzzy
 msgid "Cannot find history logs database"
@@ -9277,55 +9236,65 @@ msgstr "Histórico de Conversas com %s"
 msgid "Disk Error"
 msgstr "Erro:"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Introduza a sua mensagem :"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Erro:"
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr ""
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Imagem é muito grande"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 #, fuzzy
 msgid "Group Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
@@ -9387,12 +9356,12 @@ msgstr "_Continuar"
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "Localização do ficheiro"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tal sala não existe."
@@ -9400,7 +9369,7 @@ msgstr "Tal sala não existe."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr ""
 
@@ -9434,46 +9403,46 @@ msgstr ""
 "Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
 "mais tarde."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar este pedido, você passará a saber o seu estado."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9481,28 +9450,28 @@ msgstr ""
 "Mudar o seu estado para invisível fará com que seja desligado desses chats. "
 "De certeza que deseja tornar-se invisível?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Tem a certeza de que deseja sair das salas \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9510,16 +9479,16 @@ msgid ""
 msgstr ""
 "As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9528,12 +9497,12 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9542,61 +9511,72 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Contacto:"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Remover"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -9606,12 +9586,12 @@ msgstr ""
 "sempre como offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9619,17 +9599,17 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto saiba o meu estado depois da remoção"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9638,55 +9618,68 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ficheiro Inválido"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s quer enviar-lhe um ficheiro:"
 msgstr[1] "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
@@ -9696,128 +9689,139 @@ msgstr "Envia um ficheiro a um contacto"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "para conta %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "usando conta %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gerir Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descobrir Recursos..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Nova Mensagem"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilizadores _Online"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Eu gostaria de o adicionar à minha lista"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Contacto:"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Editar _Grupos"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "E_nviar Mensagem Simples"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr ""
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transportes"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Renomear"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "Contacto Entrou"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "Chat"
+msgid "_Disconnect"
+msgstr "Contacto Entrou"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Entrar num Chat"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
@@ -9834,20 +9838,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Assunto: %s\n"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9857,7 +9861,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10051,6 +10055,137 @@ msgstr ""
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
+#, fuzzy
+#~ msgid "Add Special _Notification"
+#~ msgstr "<b>Notificações Visuais</b>"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Atribuir chave OpenPGP"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Comandos: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Uso: /%s, limpa a janela de texto."
+
+#, fuzzy
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Uso: /%s, limpa a janela de texto."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
+#~ "pessoa. (Por exemplo, /%s explode.)"
+
+#, fuzzy
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Uso: /%s, muda a janela de chat para o modo compacto."
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Uso: /%s, limpa a janela de texto."
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Não há informações de ajuda para /%s"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Alcunha não encontrada: %s"
+
+#, fuzzy
+#~ msgid "This group chat has no subject"
+#~ msgstr "Esta sala não tem assunto"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Alcunha não encontrada: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Uso: /%s <alcunha|JID> [razão], bane o JID da sala. A alcunha de um "
+#~ "ocupante pode ser substituida, mas não se conter \"@\". Se o JID estiver "
+#~ "neste momento na sala, este será também expulso. Não suporta espaços numa "
+#~ "alcunha."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
+#~ "especificado."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Uso: /%s [razão], fecha a janela ou aba actual, exibindo a razão se "
+#~ "especificada."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Uso: /%s <JID> [razão], convida o JID para a sala actual, fornecendo "
+#~ "opcionalmente uma razão."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Uso: /%s <sala>@<servidor>[/alcunha], convida a juntar-se a "
+#~ "sala@servidor, usando opcionalmente uma alcunha especificada."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Uso: /%s <alcunha> [razão], remove o ocupante especificado pela alcunha "
+#~ "da sala e opcionalmente exibe uma razão. Não suporta espaços na alcunha."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Uso: /%s <alcunha> [mensagem], abre uma janela de mensagem privada e "
+#~ "envia uma mensagem ao ocupante da sala especificado pela alcunha."
+
+#, fuzzy
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
+
+#, fuzzy
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Uso: /%s <message>, envia uma mensagem sem procurar por outros comandos."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Clique para ver os serviços (tais como transportes MSN e ICQ) dos "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 63fb57d1b..d766541d9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-24 09:09+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-09-23 09:56-0300\n"
 "Last-Translator: Djavan Fagundes <dnoway@gmail.com>\n"
 "Language-Team: Português Brasileiro <gajim-devel@gajim.org>\n"
@@ -299,8 +299,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2686
-#: ../src/roster_window.py:5270
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Geral"
 
@@ -360,21 +360,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informações sobre você são gravadas no servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1578
-#: ../src/config.py:2122
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
 #. None means no proxy profile selected
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1104
-#: ../src/config.py:1207 ../src/config.py:1483 ../src/config.py:1488
-#: ../src/config.py:2029 ../src/config.py:2108 ../src/config.py:2121
-#: ../src/config.py:3257 ../src/config.py:3330 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2756 ../src/roster_window.py:2762
-#: ../src/roster_window.py:2767
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Nenhum"
 
@@ -529,8 +529,8 @@ msgstr ""
 "Considere a possível modificação das regras do seu firewall."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1602
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -544,7 +544,7 @@ msgid "Mer_ge accounts"
 msgstr "Mes_clar contas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5221
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Re_nomear"
 
@@ -1008,7 +1008,7 @@ msgid "Join _Group Chat"
 msgstr "_Entrar em uma conferência"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Adicionar à lista..."
 
@@ -1034,36 +1034,6 @@ msgstr "_Visualizar no navegador"
 msgid "_Start Chat"
 msgstr "_Iniciar conversa"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Convidar _contatos"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Enviar _arquivo"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Alternar para criptografia End to End"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Ativar criptografia Open_PGP"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Adicionar à lista"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5928
-msgid "_History"
-msgstr "_Histórico"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "Con_vidar"
@@ -1088,6 +1058,119 @@ msgstr ""
 "Você está prestes a iniciar uma Conversa Multi-Usuário (MUC).\n"
 "Selecione os contatos que você quer convidar"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "P_eça para ver o status dele/dela"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Adicionar _notificação especial..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Atribuir chave Open_PGP..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Executar comando..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Editar _grupos..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "Con_vidar para"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Convidar _contatos"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "Remo_ver"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Enviar status perso_nalizado"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Enviar _mensagem simples..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Enviar _arquivo..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Definir _avatar personalizado..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Iniciar _conversa"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Alternar para criptografia End to End"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Ativar criptografia Open_PGP"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Permitir que ele/ela veja meu status"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Bloquear"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Proibir ele/ela de ver meu status"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Histórico"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignorar"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Gerenciar contato"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Renomear..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Inscrição"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Desbloquear"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "Nã_o ignorar"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Preencha o formulário."
@@ -1207,7 +1290,7 @@ msgstr ""
 "Linha contato\n"
 "Banner de conversa"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:810
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Negrito"
 
@@ -1231,7 +1314,7 @@ msgstr "Enviado"
 msgid "Inactive"
 msgstr "Inativo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:811
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Itálico"
 
@@ -1303,6 +1386,14 @@ msgstr "Mo_derador"
 msgid "Occupant Actions"
 msgstr "Ações de ocupante"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Enviar _arquivo"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Adicionar à lista"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administração"
@@ -1311,13 +1402,6 @@ msgstr "_Administração"
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5249 ../src/roster_window.py:5730
-#: ../src/roster_window.py:5859
-msgid "_Block"
-msgstr "_Bloquear"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Chutar"
@@ -1334,13 +1418,6 @@ msgstr "Proprietári_o"
 msgid "_Send Private Message"
 msgstr "_Enviar mensagem privada"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5243 ../src/roster_window.py:5724
-#: ../src/roster_window.py:5856
-msgid "_Unblock"
-msgstr "_Desbloquear"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voz"
@@ -1374,8 +1451,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gerenciador de histórico de conversas do Gajim</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2846
-#: ../src/dialogs.py:2946
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Deletar"
 
@@ -1428,34 +1505,39 @@ msgstr "Pesquisar:"
 msgid "_Log conversation history"
 msgstr "_Histórico de conversação"
 
-#: ../data/glade/join_groupchat_window.glade.h:2 ../src/dialogs.py:1950
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Adicionar esta sala aos marcadores (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Entrar nesta sala automaticamente quando eu conectar"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Apelido:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Ingressar"
@@ -1485,7 +1567,7 @@ msgstr "Minimizar ao entrar automaticamente"
 msgid "Print status:"
 msgstr "Imprimir status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1592
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -2019,7 +2101,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Ordena contatos pelo status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2188,34 +2270,39 @@ msgid "All"
 msgstr "Todos"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "todos por inscrição"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Negar"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Ordem:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3073
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Lista de privacidade"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "todos por inscrição"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "todos no grupo"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2227,19 +2314,19 @@ msgstr ""
 "de\n"
 "para"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "para me enviar mensagens"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "para enviar minhas requisições"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "para seu status para mim"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "para ver meu status"
 
@@ -2407,95 +2494,11 @@ msgstr "Remover conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5258
-#: ../src/roster_window.py:5740 ../src/roster_window.py:5869
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "P_eça para ver o status dele/dela"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Adicionar _notificação especial..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Atribuir chave Open_PGP..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Editar _grupos..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-#: ../src/roster_window.py:5812
-msgid "Execute Command..."
-msgstr "Executar comando..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5176 ../src/roster_window.py:5693
-msgid "In_vite to"
-msgstr "Con_vidar para"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "Remo_ver"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5186 ../src/roster_window.py:5778
-msgid "Send Cus_tom Status"
-msgstr "Enviar status perso_nalizado"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Enviar _mensagem simples..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Enviar _arquivo..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Definir _avatar personalizado..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-msgid "Start _Chat"
-msgstr "Iniciar _conversa"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Permitir que ele/ela veja meu status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Proibir ele/ela de ver meu status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignorar"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-msgid "_Manage Contact"
-msgstr "_Gerenciar contato"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Renomear..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Inscrição"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "Nã_o ignorar"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2617,7 +2620,7 @@ msgid "_Add contact"
 msgstr "_Adicionar contato"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5881
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Informações"
 
@@ -2875,48 +2878,48 @@ msgid "Service returned an error."
 msgstr "O serviço retornou um erro."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Ativado"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Desativado"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Inteiro"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:830
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Cor"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Nome da preferência"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Nada)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Escondido"
 
@@ -2930,183 +2933,182 @@ msgstr "Você recebeu uma nova entrada:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Inglês"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretão"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Tcheco"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Alemão"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Inglês britânico"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Francês"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norueguês (b)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Holandês"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Português Brasileiro"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Chinês (Ch)"
 
-#: ../src/chat_control.py:419
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Idioma do corretor ortográfico"
 
 #. we are not connected
-#: ../src/chat_control.py:447 ../src/chat_control.py:635
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/chat_control.py:448 ../src/chat_control.py:636
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
 
-#: ../src/chat_control.py:812
+#: ../src/chat_control.py:820
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: ../src/chat_control.py:813
+#: ../src/chat_control.py:821
 msgid "Strike"
 msgstr "Tachado"
 
-#: ../src/chat_control.py:836
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr "Fonte"
 
-#: ../src/chat_control.py:845
+#: ../src/chat_control.py:853
 msgid "Clear formating"
 msgstr "Limpar formatação"
 
-#: ../src/chat_control.py:917
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Realmente enviar o arquivo?"
 
-#: ../src/chat_control.py:918
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Se você enviar um arquivo para %s, ele(a) saberá o seu Jabber ID real."
 
-#: ../src/chat_control.py:1309 ../src/chat_control.py:1710
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "Criptografia GPG habilitada"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1338 ../src/chat_control.py:2140
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:881
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1860 ../src/dialogs.py:1885
-#: ../src/gajim.py:992 ../src/gajim.py:1743 ../src/roster_window.py:937
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:1867 ../src/roster_window.py:3136
-#: ../src/roster_window.py:3162 ../src/roster_window.py:5374
-#: ../src/roster_window.py:5559
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1351
+#: ../src/chat_control.py:1359
 msgid "This contact does not support file transfer."
 msgstr "Este contato não suporta transferência de arquivo."
 
-#: ../src/chat_control.py:1354
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Você precisa saber o JID real do usuário para lhe enviar um arquivo."
 
-#: ../src/chat_control.py:1461 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Artista desconhecido"
 
-#: ../src/chat_control.py:1463 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Título desconhecido"
 
-#: ../src/chat_control.py:1465 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Fonte desconhecida"
 
-#: ../src/chat_control.py:1468 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3115,17 +3117,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1605
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da conferência %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1690 ../src/dialogs.py:4418
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Nenhuma chave GPG atribuída"
 
-#: ../src/chat_control.py:1691
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3133,50 +3135,50 @@ msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Você não poderá "
 "criptografar mensagem com GPG."
 
-#: ../src/chat_control.py:1700
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "Criptografia GPG desabilitada"
 
-#: ../src/chat_control.py:1726
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "A sessão SERÁ gravada"
 
-#: ../src/chat_control.py:1728
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "A sessão NÃO SERÁ gravada"
 
 #. encryption %s active
-#: ../src/chat_control.py:1742
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "está"
 
-#: ../src/chat_control.py:1742
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "NÃO está"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1744
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:1744
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "NÃO será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1748
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "e autenticada"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "e NÃO autenticada"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1758
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3185,23 +3187,23 @@ msgstr ""
 "Criptografia%(type)s %(status)s ativa %(authenticated)s.\n"
 "Sua conversa %(logged)s está sendo gravada."
 
-#: ../src/chat_control.py:1898
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Negociação da sessão cancelada"
 
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Esta sessão está criptografada"
 
-#: ../src/chat_control.py:1908
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " e SERÁ gravada"
 
-#: ../src/chat_control.py:1910
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " e NÃO SERÁ gravada"
 
-#: ../src/chat_control.py:1915
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3209,25 +3211,25 @@ msgstr ""
 "Identidade do contato remoto não verificada. Clique no botão de proteção "
 "para mais detalhes."
 
-#: ../src/chat_control.py:1917
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "Criptografia E2E desabilitada"
 
-#: ../src/chat_control.py:1951 ../src/chat_control.py:1964
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "A seguinte mensagem NÃO estava criptografada"
 
-#: ../src/chat_control.py:1957
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "A seguinte mensagem estava criptografada"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2342
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Você acabou de receber uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:2343
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3235,15 +3237,15 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/chat_control.py:2498 ../src/common/connection_handlers.py:2075
-#: ../src/common/connection_handlers.py:2121
-#: ../src/common/connection_handlers.py:2316
-#: ../src/common/connection_handlers.py:2455 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:129
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Erro na base de dados"
 
-#: ../src/chat_control.py:2499
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3252,7 +3254,7 @@ msgstr ""
 "O arquivo da base de dados (%s) não pode ser lido. Tente repará-lo ou removê-"
 "lo. (todo o histórico será perdido)."
 
-#: ../src/chat_control.py:2729
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s agora está %(status)s"
@@ -3341,9 +3343,9 @@ msgstr "Selecione as salas das quais você quer sair"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:806
-#: ../src/roster_window.py:1573 ../src/roster_window.py:1575
-#: ../src/roster_window.py:5146
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Salas"
 
@@ -3405,28 +3407,69 @@ msgstr ""
 "Quando exibir um ícone na área de notificação. Pode ser \"nunca\", com "
 "\"eventos\" e \"sempre\"."
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Apelido inválido"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "texto da mensagem de status"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Apelido inválido"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Mudando apelido"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "texto da mensagem de status"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (separada por espaços) de linhas (contas e grupos) que estão agrupados."
 
 #. sorted alphanum
-#: ../src/common/config.py:99 ../src/common/config.py:475
-#: ../src/common/optparser.py:234 ../src/common/optparser.py:452
-#: ../src/common/optparser.py:486 ../src/gajim.py:3455
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "padrão"
 
-#: ../src/common/config.py:103
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Ativar mensagens \"link-local\"/\"zeroconf\""
-
-#: ../src/common/config.py:106
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Idioma usado pelo corretor ortográfico"
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3436,7 +3479,7 @@ msgstr ""
 "'às vezes' - mostrar hora a cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca mostrar a hora."
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3446,18 +3489,18 @@ msgstr ""
 "varia de 1 a 4, 0 desabilita a função. 1 é relógio mais preciso, 4 é o "
 "menos. Isto é usado apenas se o valor de print_time for 'às vezes'."
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Aproveite os pare * /_ como caracteres de formatação."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se verdadeiro, não remova */_. Assim *ABC* será negrito mas com * * não "
 "removido."
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3468,7 +3511,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Se você quiser usar "
 "isso, instale o docutils)"
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3476,7 +3519,7 @@ msgstr ""
 "Caracter a adicionar ao apelido quando se estiver usando o recurso de "
 "completar apelido (tecla Tab) na conferência."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3484,7 +3527,7 @@ msgstr ""
 "O caracter a ser proposto para adicionar ao final do apelido desejado quando "
 "ele já estiver sendo usado por outra pessoa na conferência."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3495,19 +3538,19 @@ msgstr ""
 "por strftime na documentação do Python: http://docs.python.org/lib/module-"
 "time.html"
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Os caracteres que são exibidos antes do apelido nas conversas"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Os caracteres que são exibidos após o apelidos nas conversas"
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista?"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3515,26 +3558,26 @@ msgstr ""
 "Quantas linhas lembrar da conversação anterior quando uma aba/janela de bate-"
 "papo for reaberta."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quantos minutos mostrar ao exibir as últimas linhas da conversação anterior."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr ""
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:170
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3542,11 +3585,11 @@ msgstr ""
 "Enviar a mensagem com Ctrl+Enter e criar uma nova linha com Enter "
 "(comportamento padrão do cliente ICQ da Mirabilis)."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quantas linhas armazenar com Ctrl+Acima."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3555,12 +3598,12 @@ msgstr ""
 "Uma ou outra URL costuma vir com %s onde %s é a palvra/frase ou em "
 "'WIKTIONARY' que significam o uso wiktionary."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se verificado, Gajim pode ser remotamente controlado usando gajim-remoto."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3572,14 +3615,14 @@ msgstr ""
 "configurado para Falso e se estiverem sincronizadas com o status global) "
 "baseado no status da conexão de rede."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notificações de estado de conversa enviados. Pode ser one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3587,7 +3630,7 @@ msgstr ""
 "Notificações de estado de conversa exibidos nas janelas de conversa. Pode "
 "ser one of all, composing_only, disabled."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3595,11 +3638,11 @@ msgstr ""
 "Quando não estiver exibindo a hora para cada mensagem (print_time == "
 "simetimes), exibi-lo a cada x minutos."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar um aba ou janela de conferência."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3607,7 +3650,7 @@ msgstr ""
 "Sempre perguntar antes de fechar um aba/janela nesta lista separada por "
 "espaço de JID's de conferências."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3615,7 +3658,7 @@ msgstr ""
 "Nunca perguntar antes de fechar uma aba/janela de conferência nesta lista "
 "separada por espaço de salas separadas por jids."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
@@ -3624,7 +3667,7 @@ msgstr ""
 "dados (conversa, conversa privada, conferências que não podem ser "
 "minimizadas)"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3633,27 +3676,27 @@ msgstr ""
 "interfaces locais, para Transferência de Arquivo no caso de tradução de "
 "endereço/encaminhamento de porta."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Padrão da IEC diz que KiB = 1024 bytes e KB = 1000 bytes."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Notificar os eventos no ícone da bandeja do sistema."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando tiver apenas uma bate papo?"
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda de caderno tabulada nas janelas de conversa?"
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3665,18 +3708,18 @@ msgstr ""
 "16, 17 e 18. Números maiores são mais seguros, mas demoram mais para "
 "calcular quando você inicia uma sessão."
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Pré-visualizar novas mensagens em uma janela popup?"
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Uma lista separada por ponto-e-vírgula das palavras que serão destacadas nas "
 "conferências."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3684,13 +3727,13 @@ msgstr ""
 "Se verdadeiro, o Gajim sairá quando o botão sair da janela for clicado. Esta "
 "opção só faz sentido quando a opção trayicon está sendo usada."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Se verdadeiro, o Gajim verifica ao iniciar se é o cliente Jabber padrão."
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3698,7 +3741,7 @@ msgstr ""
 "Se verdadeiro, Gajim mostrará um ícone para cada aba contendo mensagens não "
 "lidas. Dependendo do tema, este ícone pode ser animado."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3706,11 +3749,11 @@ msgstr ""
 "Se verdadeiro, o Gajim indicará a mensagem de status, se não estiver vazia, "
 "para cada contato sob o nome do contato na janela da lista."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Define a posição do avatar na lista. Pode ser esquerda ou direita"
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3718,7 +3761,7 @@ msgstr ""
 "Se verdadeiro, Gajim pedirá por avatar cada contato que não teve um avatar "
 "ou tem um cache que é velho demais."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3726,7 +3769,7 @@ msgstr ""
 "Se falso, você não verá por mais muito tempo a linha de status nas conversas "
 "quando um contato alterar seu status e/ou sua mensagem de status."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3740,29 +3783,29 @@ msgstr ""
 "\" o Gajim exibirá todas as mensagens de status. Se for \"in_and_out\" o "
 "Gajim só mostrará FOO entradas/saídas em conferências."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Cor de fundo dos contatos quando eles simplesmente conectarem."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Cor de fundo dos contatos quando eles simplesmente desconectarem."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se Verdadeiro, as mensagens restauradas usarão uma fonte menor que o padrão."
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Não mostrar o avatar para o próprio transporte."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Não mostrar a lista na bandeja do sistema."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3772,7 +3815,7 @@ msgstr ""
 "faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
 "Janela) quando esperam eventos pendentes."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3783,7 +3826,7 @@ msgstr ""
 "informações sha na presenças de conferências."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:238
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3804,32 +3847,32 @@ msgstr ""
 "'pertype' - Cada tipo de mensagem (ex. bate-papo vs. conferência) são "
 "enviadas para uma janela específica."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Se falso, você não verá por muito tempo o avatar na janela do bate-papo."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se verdadeiro, pressionando a tecla Esc fecha a aba/janela."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Esconder os botões nas janelas de conversa."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Esconder o banner na janela de conferência"
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Esconder o banner na janela de conversa para duas pessoas"
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Esconder a lista dos ocupantes da sala na janela da conferência."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3837,15 +3880,15 @@ msgstr ""
 "Em uma conferência, mostrar o apelido no começo da linha apenas quando a "
 "mensagem atual não for da mesma pessoa que mandou a última."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Usar identação ao mesclar apelidos consecutivos."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Suavizar a rolagem de mensagens na janela de conversação"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3853,13 +3896,13 @@ msgstr ""
 "A lista de cores, separadas por \":\", que serão usadas para colorir os "
 "apelidos nas salas de conferência."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Quando nenhum aba tiver uma mensagem não lida, Ctrl + Tab vai para a próxima "
 "aba."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3867,7 +3910,7 @@ msgstr ""
 "Devemos mostrar o diálogo de confirmação de metacontatos ou não? Uma string "
 "vazia significa que nós nunca devemos mostrar o diálogo."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:257
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -3876,7 +3919,7 @@ msgstr ""
 "Devemos mostrar o diálogo de confirmação de metacontatos ou não? Uma string "
 "vazia significa que nós nunca devemos mostrar o diálogo."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -3885,7 +3928,7 @@ msgstr ""
 "Devemos mostrar o diálogo de confirmação de metacontatos ou não? Uma string "
 "vazia significa que nós nunca devemos mostrar o diálogo."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3896,7 +3939,7 @@ msgstr ""
 "autenticado com uma prioridade negativa, você NÃO poderá receber nenhuma "
 "mensagem do seu servidor."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3904,7 +3947,7 @@ msgstr ""
 "Se verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
 "as senhas das contas."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3913,7 +3956,7 @@ msgstr ""
 "Se verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
 "as senhas das contas."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3921,7 +3964,7 @@ msgstr ""
 "Se Verdadeiro, o Gajim mostrará o número de contatos online e do total de "
 "contatos nas linha de conta e grupo."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3929,7 +3972,7 @@ msgstr ""
 "Pode ser vazio, 'chat' ou 'normal'. Se for vazio, trata todas as mensagens "
 "recebidas como se elas fossem do tipo especificado"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3937,7 +3980,7 @@ msgstr ""
 "Se Verdadeiro, o Gajim irá rolar e selecionar o contato que lhe enviou a "
 "última mensagem, se a janela de conversa ainda não estiver aberta."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3945,13 +3988,13 @@ msgstr ""
 "Se definido como verdadeiro o Gajim converterá strings entre $$ e $$ em uma "
 "imagem usando o dvips antes de inseri-la em uma janela de conversa."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "O tempo de inatividade necessário antes de fechar a janela de alteração de "
 "status."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3959,7 +4002,7 @@ msgstr ""
 "Número máximo de linhas que são exibidas em conversações. As linhas mais "
 "antigas são apagadas."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3967,11 +4010,11 @@ msgstr ""
 "Se marcado como Verdadeiro as janelas de notificação do notification-daemon "
 "serão anexadas ao ícone da bandeja do sistema."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Escolha intervalo entre 2 verificações de inatividade."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3979,7 +4022,7 @@ msgstr ""
 "Alterar o valor para alterar o status das fórmulas latex exibidas. Quanto "
 "mais elevado é maior."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -3987,7 +4030,7 @@ msgstr ""
 "Esquema uri válido. Somente esquemas nesta lista irão ser aceitos como uri "
 "\"real\". (mailto e xmpp são manipulados separadamente)"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
@@ -3996,7 +4039,17 @@ msgstr ""
 "conexão com uma conta for estabelecida. AVISO: Isto pode resultar em muitas "
 "requisições a serem enviadas."
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4004,7 +4057,7 @@ msgstr ""
 "A prioridade será alterada automaticamente de acordo com o seu status. As "
 "prioridades são definidas nas opções autopriority_*."
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4013,32 +4066,39 @@ msgstr ""
 "inativo, fora, np, invisível. NOTA: esta opção é usada somente se a opção "
 "restore_last_status estiver desativada"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Se habilitado, restaura o último status que foi usado."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:297
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Se falso, você não verá por muito tempo o avatar na janela do bate-papo."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Se desativado, não assinar presenças com chaves GPG, se o GPG estiver "
 "configurado."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Habilitar criptografia ESessions para esta conta."
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "O Gajim deve iniciar automaticamente em sessão criptografada quando possível?"
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4046,30 +4106,30 @@ msgstr ""
 "Lista ordenada de tipos de conexão (separada por espaço) para tentar. Pode "
 "conter tls, ssl ou simples"
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Exibir uma mensagem de alerta antes de usar uma biblioteca padrão SSL."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espaços de erros do ssl para ignorar."
 
-#: ../src/common/config.py:310
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr "Espaço em branco enviado após inatividade"
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr "Ping XMPP enviado após inatividade"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4078,11 +4138,11 @@ msgstr ""
 "tentar reconectar."
 
 #. yes, no, ask
-#: ../src/common/config.py:319
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 rodando"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4090,15 +4150,15 @@ msgstr ""
 "Se checado, o Gaijm usará seu IP e proxies definidos no "
 "file_transfer_proxies, em opções para transferência de arquivos."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Respostas para requisições recebidas"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Requisições recebidas enviadas"
 
-#: ../src/common/config.py:346
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4106,11 +4166,11 @@ msgstr ""
 "Ao negociar uma sessão criptografada, o Gajim deve assumir que você quer que "
 "suas mensagens sejam gravadas?"
 
-#: ../src/common/config.py:409
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "O OpenPGP está ativado para este contato?"
 
-#: ../src/common/config.py:410
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4118,101 +4178,101 @@ msgstr ""
 "O Gajim deve iniciar automaticamente uma sessão criptografada com este "
 "contato quando possível?"
 
-#: ../src/common/config.py:411 ../src/common/config.py:414
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Idioma a usar na verificação ortográficas das palavras"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "todos ou lista de status separados por espaço"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'sim', 'não' ou 'ambos'"
 
-#: ../src/common/config.py:422 ../src/common/config.py:424
-#: ../src/common/config.py:425 ../src/common/config.py:428
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'sim', 'não', ou ''"
 
-#: ../src/common/config.py:435 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:437 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:439 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:440
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:440
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida."
 
-#: ../src/common/config.py:452
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Estou disponível."
 
-#: ../src/common/config.py:453
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Estou livre para conversar."
 
-#: ../src/common/config.py:454 ../src/config.py:1415
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: ../src/common/config.py:455
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Não estou disponível."
 
-#: ../src/common/config.py:456
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Não perturbe."
 
-#: ../src/common/config.py:457 ../src/common/config.py:458
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Tchau!"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4220,98 +4280,98 @@ msgstr ""
 "Som para tocar quando uma mensagem MUC conter uma das palavras no "
 "muc_hightlight_words, ou quando uma mensagem MUC contiver seu apelido."
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
-#: ../src/common/config.py:478 ../src/common/optparser.py:248
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:482 ../src/common/optparser.py:234
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:490
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marinho"
 
-#: ../src/common/connection_handlers.py:75
+#: ../src/common/connection_handlers.py:76
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Incapaz de carregar o módulo inativo"
 
-#: ../src/common/connection_handlers.py:243
+#: ../src/common/connection_handlers.py:244
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Servidor errado"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Endereço local inválido? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "A informação do registo para o transporte %s não chegou a tempo"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 msgid "Registration succeeded"
 msgstr "Registro realizado com sucesso"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registro com o agente %s completado com sucesso"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 msgid "Registration failed"
 msgstr "Falha ao registrar"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Registro com o agente %(agent)s falhou com erro %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:994
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2453 ../src/common/connection.py:1369
-#: ../src/gajim.py:379
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Erro de escrita em disco"
 
-#: ../src/common/connection_handlers.py:1211 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Sem suporte a invisibilidade"
 
-#: ../src/common/connection_handlers.py:1212 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "A conta %s não suporta invisibilidade."
 
-#: ../src/common/connection_handlers.py:1894 ../src/common/connection.py:1184
-#: ../src/config.py:1866 ../src/config.py:1875 ../src/config.py:1934
-#: ../src/config.py:3221 ../src/dataforms_widget.py:555 ../src/dialogs.py:2629
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID inválido:"
 
-#: ../src/common/connection_handlers.py:1895
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Uma mensagem de um JID não-valido recebida, ela foi ignorada."
 
-#: ../src/common/connection_handlers.py:2076
-#: ../src/common/connection_handlers.py:2122
-#: ../src/common/connection_handlers.py:2317
-#: ../src/common/connection_handlers.py:2456 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:130
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4321,77 +4381,84 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) ou removê-lo (todo o histórico "
 "será perdido)."
 
-#: ../src/common/connection_handlers.py:2201
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Apelido não permitido: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2285
-#: ../src/common/connection_handlers.py:2289 ../src/gajim.py:522
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Impossível ingressar na sala"
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Você está banido da sala %s."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "A sala %s não existe."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "A criação de sala é restrita."
 
-#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Seu nickname registado deve ser usado na sala %s."
 
-#: ../src/common/connection_handlers.py:2290
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Você não está na lista de membros da sala %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2332
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "A sala foi excluída"
 
-#: ../src/common/connection_handlers.py:2340
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Você pode entrar nessa sala ao invés: %s"
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de adiciona-lo à minha lista."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nós estamos agora inscritos para %s"
 
-#: ../src/common/connection_handlers.py:2394
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "remoção de inscrição solicitada por %s"
 
-#: ../src/common/connection_handlers.py:2396
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nós estamos agora sem inscrição para %s"
 
-#: ../src/common/connection_handlers.py:2585
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4401,209 +4468,209 @@ msgstr ""
 "ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
 "removê-lo"
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Não foi possível obter certificado CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Não foi possível descriptografar a assinatura do certificado"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Não foi possível descriptografar a assinatura CRL"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Não foi possível decodificar a chave pública do emissor"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Assinatura do certificado falhou"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Falha na assinatura CRL"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "O certificado ainda não é válido"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "O certificado expirou"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL ainda não é válido"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL expirou"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Erro de formato nos certificados no campo notBefore"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Erro de formato nos certificados no campo notAfter"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erro de formato no campo lastUpdate do CRL"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erro de formato no campo nextUpdate do CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Memória insuficiente"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Certificado próprio"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado próprio na cadeia de certificados"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor local"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Não foi possível verificar o primeiro certificado"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "A cadeia de certificados é muito longa"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Certificado revocado"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Certificado CA inválido"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Limite de comprimento do caminho excedido"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Certificado de propósito não suportado"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Certificado não confiável"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Certificado rejeitado"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Assunto do emissor não coincide"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Chave identificadora de autoridade e assunto não coincidem"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoridade e número serial do emissor não coincidem"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "O uso das chaves não inclui assinatura de certificado"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Verificação do aplicativo falhou"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Reconecte manualmente."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "O servidor %(name)s respondeu erroneamente à requisição de registro: %(error)"
 "s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "O servidor %s forneceu um formulário de registro diferente"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erro de SSL desconhecido: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Resposta inválida"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "O transporte %(name)s respondeu erroneamente à requisição de registro do "
 "pedido: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1087
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, python-format
 msgid "Server replied: %s"
 msgstr "O servidor respondeu: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Falha na conexão com o proxy"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Não foi possível conectar a conta %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "A conexão com a conta %s foi perdida. Tentando reconectar."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "A autenticidade do certificado %s pode ser inválida."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4612,7 +4679,7 @@ msgstr ""
 "\n"
 "Erro de SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4621,24 +4688,24 @@ msgstr ""
 "\n"
 "Erro de SSL desconhecido: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique se seu login e senha estão corretos."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Erro ao remover lista de privacidade"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4647,30 +4714,30 @@ msgstr ""
 "A lista de privacidade %s não foi removida. Ela pode estar ativa em um ou "
 "mais recursos conectados. Desative-os e tente novamente."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2630
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Não é possível enviar uma mensagem para %s, este não é um JID válido."
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Nem a presença remota está assinada, nem uma chave foi atribuída."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "A chave do contato (%s) não coincide com a chave atribuída no Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensagem está *criptografada* (Veja :XEP:`27`)]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4679,41 +4746,41 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Convidar _contatos"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Não baixado por causa do status invisível"
 
-#: ../src/common/connection.py:1960
+#: ../src/common/connection.py:1982
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Falha ao registrar"
 
-#: ../src/common/connection.py:1961
+#: ../src/common/connection.py:1983
 #, fuzzy, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 "Registro com o agente %(agent)s falhou com erro %(error)s: %(error_msg)s"
 
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:992
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Observadores"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:801 ../src/roster_window.py:841
-#: ../src/roster_window.py:1496 ../src/roster_window.py:1565
-#: ../src/roster_window.py:1567 ../src/roster_window.py:1714
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transportes"
 
@@ -5174,11 +5241,11 @@ msgstr "%s não é um nível de gravação (loglevel) válido"
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:243 ../src/common/optparser.py:244
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "azul celeste"
 
-#: ../src/common/optparser.py:360
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "migrando base de dados de registros para índices"
 
@@ -5830,7 +5897,7 @@ msgstr ""
 "arquivos será cancelada."
 
 #. we're not english
-#: ../src/common/stanza_session.py:288
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5848,27 +5915,27 @@ msgstr ""
 "ft_override_host_to_send não é válido e será ignorado."
 
 #. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/common/zeroconf/connection_zeroconf.py:173
 msgid "OpenPGP passphrase was not given"
 msgstr "Frase de acesso do OpenPGP não foi recebida"
 
 #. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1911
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Você será conectado ao %s sem OpenPGP."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar enviando e recebendo mensagens, você precisará reconectar."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Erro do Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5877,31 +5944,31 @@ msgstr ""
 "%s\n"
 "Mensagens link-local podem não funcionar adequadamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor verifique se o Avahi ou o Bonjour estão instalados."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Impossível iniciar o serviço local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível conectar-se à porta %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor verifique se o serviço avahi-daemon está rodando."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível alterar status da conta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5910,20 +5977,20 @@ msgstr ""
 "pode ser enviada."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem está criptografada]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Sua mensagem não pode ser enviada."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contato está offline. Sua mensagem não pode ser enviada."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5936,24 +6003,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erro ao adicionar serviço. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Mensagem padrão"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "O dicionário para o idioma %s não está disponível"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5962,67 +6029,67 @@ msgstr ""
 "Você precisa instalar o dicionário %s para usar a correção ortográfica ou "
 "selecionar outro idioma ajustando a opção 'speller_language'."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
 #. Name column
-#: ../src/config.py:1337 ../src/dialogs.py:2089 ../src/dialogs.py:2153
-#: ../src/dialogs.py:2853 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Re-autenticar agora?"
 
-#: ../src/config.py:1424
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se você quer aplicar todas as mudanças, deve se re-autenticar."
 
-#: ../src/config.py:1552 ../src/config.py:1674
+#: ../src/config.py:1559 ../src/config.py:1684
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1710 ../src/config.py:1755
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Eventos não lidos"
 
-#: ../src/config.py:1711
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: ../src/config.py:1737
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Você iniciou uma conversa usando a conta %s"
 
-#: ../src/config.py:1738
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Todas as janelas de conversa e conferência serão fechadas. Confirma?"
 
-#: ../src/config.py:1751
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1752
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar desconectado."
 
-#: ../src/config.py:1756
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, você deve ler todas os eventos pendentes."
 
-#: ../src/config.py:1762
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1763
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6030,143 +6097,148 @@ msgstr ""
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
 
-#: ../src/config.py:1767 ../src/config.py:1771
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1768
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1772
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1847
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Renomear conta"
 
-#: ../src/config.py:1848
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entre com um novo nome para a conta %s"
 
-#: ../src/config.py:1876
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve ter o seguinte formato \"usuario@nomedoservidor\"."
 
-#: ../src/config.py:2084 ../src/config.py:3267
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2085 ../src/config.py:3268
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:2106
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:2107
+#: ../src/config.py:2116
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:2141
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de chave OpenPGP"
 
-#: ../src/config.py:2142
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2149
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:2150
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Você deve primeiro criar sua conta antes de editar suas informações pessoais."
 
-#: ../src/config.py:2157 ../src/dialogs.py:1911 ../src/dialogs.py:2077
-#: ../src/dialogs.py:2256 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Você deve estar conectado para editar suas informações pessoais."
 
-#: ../src/config.py:2162
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Seu servidor não suporta Vcard"
 
-#: ../src/config.py:2163
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Seu servidor não pode salvar suas informações pessoais."
 
-#: ../src/config.py:2194
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Para mudar o nome da conta, você deve estar desconectado."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Conta local já existe."
 
-#: ../src/config.py:2195
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor renomeie ou remova-o antes de ativar troca de mensagens \"link-"
 "local\"."
 
-#: ../src/config.py:2378
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
 #. list at the beginning
-#: ../src/config.py:2416
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Lista de membros"
 
-#: ../src/config.py:2418
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Lista de proprietários"
 
-#: ../src/config.py:2419
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2468 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2485
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2491
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Cargo"
 
-#: ../src/config.py:2518
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2520
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6174,11 +6246,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2522
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Adicionando membro..."
 
-#: ../src/config.py:2523
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6186,11 +6258,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Adicionando proprietário..."
 
-#: ../src/config.py:2526
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6198,11 +6270,11 @@ msgstr ""
 "<b>Quem você quer tornar um proprietário?</b>\n"
 "\n"
 
-#: ../src/config.py:2528
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Adicionando administrador..."
 
-#: ../src/config.py:2529
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6210,7 +6282,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2530
+#: ../src/config.py:2590
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6226,58 +6298,58 @@ msgstr ""
 "4. domínio (o domínio combina por si com qualquer usuario@dominio,\n"
 "domínio/recurso, ou endereço contendo um subdomínio."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2649 ../src/gajim.py:1484 ../src/gajim.py:1581
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2650 ../src/gajim.py:1561
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2651 ../src/gajim.py:1581
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2661
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2759
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/config.py:2759
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?exibir_status:Todos"
 
-#: ../src/config.py:2760
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Apenas entre e saia"
 
-#: ../src/config.py:2761
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?exibir_status:Nenhum"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Nova conferência"
 
-#: ../src/config.py:2862
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tem dados inválidos"
 
-#: ../src/config.py:2863
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6285,66 +6357,67 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#: ../src/config.py:2981 ../src/dialogs.py:1724
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: ../src/config.py:2982 ../src/config.py:2996 ../src/config.py:3010
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Apelido não permitido: %s"
 
-#: ../src/config.py:2995 ../src/config.py:3243
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Servidor inválido"
 
-#: ../src/config.py:3009
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:3160
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:3161 ../src/config.py:3167
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Você pode configurar as opções avançadas da conta pressionando o botão "
 "avançado, ou mais tarde clicando em contas no menu editar da janela "
 "principal."
 
-#: ../src/config.py:3166
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3204
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:3206
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:3244
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, forneça um servidor no qual você queira se registrar."
 
-#: ../src/config.py:3300 ../src/gajim.py:2131
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Certificado já está no arquivo"
 
-#: ../src/config.py:3301 ../src/gajim.py:2132
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Este certificado já está no arquivo %s, então, ele não será adicionado "
 "novamente."
 
-#: ../src/config.py:3369
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6359,7 +6432,7 @@ msgstr ""
 "Erro do SSL: %(error)s\n"
 "Você ainda quer conectar com este servidor?"
 
-#: ../src/config.py:3375 ../src/gajim.py:2156
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6370,63 +6443,63 @@ msgstr ""
 "SHA1 fingerprint do certificado:\n"
 "%s"
 
-#: ../src/config.py:3400 ../src/config.py:3423
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:3490
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3491
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/config.py:3644
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:3652
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3687
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Primeira mensagem recebida"
 
-#: ../src/config.py:3688
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Nova mensagem recebida com foco"
 
-#: ../src/config.py:3690
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Nova mensagem recebida sem foco"
 
-#: ../src/config.py:3691
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Contato conectado"
 
-#: ../src/config.py:3692
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Contato desconectou"
 
-#: ../src/config.py:3693
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Mensagem enviada"
 
-#: ../src/config.py:3694
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem destacada de conferência"
 
-#: ../src/config.py:3695
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Mensagem de conferência recebida"
 
-#: ../src/config.py:3696
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Email do GMail recebido"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6436,7 +6509,7 @@ msgstr ""
 "recebida por um fim remoto. Se este ícone continuar\n"
 "por muito tempo, isso indica que a mensagem foi perdida."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6444,55 +6517,55 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde a\n"
 "última vez onde você prestou a atenção a conferência"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 msgid "_Quote"
 msgstr "_Frase"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Ações para \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _dicionário"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL do dicionário não existe \"%s\" e isto não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de procura na web não existe \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Procura na web por isto"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Abrir como _link"
 
-#: ../src/conversation_textview.py:1243
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1247
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1281
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -6545,120 +6618,120 @@ msgstr "Nome do contato"
 msgid "Set Mood"
 msgstr "Definir humor"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s mensagem de status"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Sobrescrever mensagem de status?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Este nome já está sendo usado. Você quer sobrescrever essa mensagem de "
 "status?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Salvar como a mensagem de status pré-configurada"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Por favor, escreva um nome para esta mensagem de status"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "Endereço AIM:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "Endereço MSN:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Endereço Yahoo!:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, preencha os dados do contato se você quer adicionar na conta %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Você não pode adicionar você mesmo na sua lista."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à lista"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "ID do usuário:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Versão do GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Versão do PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Desenvolvedores atuais:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Desenvolvedores passados:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "AGRADECIMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Nós gostaríamos de agradecer todos os mantedores do pacote."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br>\n"
@@ -6666,7 +6739,7 @@ msgstr ""
 "Djavan Fagundes <dnoway@gmail.com>\n"
 "Og Maciel <og.maciel@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6679,99 +6752,99 @@ msgstr ""
 "\n"
 "O recurso de destacar palavras grafadas incorretamente não será usado"
 
-#: ../src/dialogs.py:1725 ../src/dialogs.py:2032
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "O apelido possui caracteres não permitidos."
 
-#: ../src/dialogs.py:1837
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Solicitação de inscrição para conta %(account)s de %(jid)s"
 
-#: ../src/dialogs.py:1840
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:1906 ../src/gajim.py:2804
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Você já está na conferência %s"
 
-#: ../src/dialogs.py:1912
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Você não pode ingressar em uma sala de conferência até que esteja conectado."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:2021
+#: ../src/dialogs.py:2050
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Nome de conta inválido"
 
-#: ../src/dialogs.py:2022
+#: ../src/dialogs.py:2051
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Selecione a conta que você quer para entrar na sala"
 
-#: ../src/dialogs.py:2031
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Apelido inválido"
 
-#: ../src/dialogs.py:2036 ../src/dialogs.py:2042
-#: ../src/groupchat_control.py:1731
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID da conferência inválido:"
 
-#: ../src/dialogs.py:2037 ../src/dialogs.py:2043
-#: ../src/groupchat_control.py:1732
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "O Jabber ID da conferência possui caracteres não permitidos."
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Isto não é uma conferência"
 
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s não é o nome da conferência."
 
-#: ../src/dialogs.py:2078
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sem uma conexão, você pode não sincronizar seus contatos."
 
-#: ../src/dialogs.py:2092
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Esta conta não está conectada ao servidor"
 
-#: ../src/dialogs.py:2126
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Você não pode sincronizar com uma conta a menos que esteja conectado."
 
-#: ../src/dialogs.py:2150
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2208
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:2210
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:2211
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6780,300 +6853,300 @@ msgstr ""
 "você quer enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2235 ../src/dialogs.py:2615 ../src/dialogs.py:2777
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:2236 ../src/dialogs.py:2616 ../src/dialogs.py:2778
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, tenha certeza que você está conectado com \"%s\"."
 
-#: ../src/dialogs.py:2245 ../src/dialogs.py:2248
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "JID inválido:"
 
-#: ../src/dialogs.py:2248
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível gravar o arquivo em \"%s\"."
 
-#: ../src/dialogs.py:2257
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar conectado para mudar sua senha."
 
-#: ../src/dialogs.py:2276
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Senha inválida"
 
-#: ../src/dialogs.py:2276
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: ../src/dialogs.py:2280
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2320 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:2322 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2324 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nova mensagem"
 
 #. single message
-#: ../src/dialogs.py:2324 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nova mensagem"
 
 #. private message
-#: ../src/dialogs.py:2325 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Enviar mensagem privada"
 
-#: ../src/dialogs.py:2325 ../src/gajim.py:1697 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Novo e-mail"
 
-#: ../src/dialogs.py:2327 ../src/gajim.py:1763 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Solicitação de transferência de arquivos"
 
-#: ../src/dialogs.py:2329 ../src/gajim.py:1663 ../src/gajim.py:1730
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Erro na transferência de arquivos"
 
-#: ../src/dialogs.py:2331 ../src/gajim.py:1808 ../src/gajim.py:1830
-#: ../src/gajim.py:1847 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Transferência do arquivo completa"
 
-#: ../src/dialogs.py:2332 ../src/gajim.py:1811 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Transferência do arquivo parada"
 
-#: ../src/dialogs.py:2334 ../src/gajim.py:1505 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Convite para conferência"
 
-#: ../src/dialogs.py:2336 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "O contato alterou seu status"
 
-#: ../src/dialogs.py:2534
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem simples usando conta %s"
 
-#: ../src/dialogs.py:2536
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem simples na conta %s"
 
-#: ../src/dialogs.py:2538
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2541
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2564
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2587
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Formulário %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2667
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:2718
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2827
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Por favor, eu gostaria de adicioná-lo à minha lista."
 
-#: ../src/dialogs.py:2842 ../src/dialogs.py:2889
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Endereço"
 
-#: ../src/dialogs.py:2844 ../src/dialogs.py:2921
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Mal-humorado"
 
-#: ../src/dialogs.py:2850
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2967
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Eu gostaria de adiciona-lo à minha lista."
 
-#: ../src/dialogs.py:3067
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3071
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:3127
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordem: %(order)s, ação: %(action)s tipo: %(type)s, valor: %(value)s"
 
-#: ../src/dialogs.py:3132
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordem: %(order)s, ação: %(action)s"
 
-#: ../src/dialogs.py:3174
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar uma regra</b>"
 
-#: ../src/dialogs.py:3261
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Adicionar uma regra</b>"
 
-#: ../src/dialogs.py:3357
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:3359
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Listas de privacidade"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Nome de lista inválido"
 
-#: ../src/dialogs.py:3430
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Você deve digitar um nome para criar uma lista de privacidade."
 
-#: ../src/dialogs.py:3462
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Você foi convidado para uma conferência"
 
-#: ../src/dialogs.py:3465
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact convidou você para ingressar em uma discussão"
 
-#: ../src/dialogs.py:3467
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact convidou você para entrar na conferência %(room_jid)s"
 
-#: ../src/dialogs.py:3475
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:3477
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Você quer aceitar este convite?"
 
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Escolher som"
 
-#: ../src/dialogs.py:3543 ../src/dialogs.py:3597
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:3548
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:3584
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:3602
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando notificação especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:3738
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3744
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Condição"
 
-#: ../src/dialogs.py:3862
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "quando eu estiver "
 
-#: ../src/dialogs.py:4334
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7084,19 +7157,19 @@ msgstr ""
 "\n"
 "A String Curta de Autenticação (SAS) da sessão é <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4338
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Você já verificou a identidade deste contato."
 
-#: ../src/dialogs.py:4344 ../src/dialogs.py:4431
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Identidade do contato verificada"
 
-#: ../src/dialogs.py:4352
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Verificar novamente..."
 
-#: ../src/dialogs.py:4357
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7106,19 +7179,19 @@ msgstr ""
 "mensagens e enviar mensagens, você precisa verificar a identidade dela "
 "clicando no botão abaixo."
 
-#: ../src/dialogs.py:4360 ../src/dialogs.py:4412 ../src/dialogs.py:4425
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "A identidade do contato NÃO foi verificada"
 
-#: ../src/dialogs.py:4367
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:4379
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Você verificou a identidade deste contato?"
 
-#: ../src/dialogs.py:4380
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7133,24 +7206,24 @@ msgstr ""
 "\n"
 "Esta String de  Autenticação Curta é <b>%(sas)s</ b>."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Você quer falar com o contato remoto e verificar a SAS?"
 
-#: ../src/dialogs.py:4413
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "A chave do contato (%s) <b>não corresponde</b> com a chave atribuída no "
 "Gajim."
 
-#: ../src/dialogs.py:4419
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Então, você não pode "
 "criptografar mensagens."
 
-#: ../src/dialogs.py:4426
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7159,7 +7232,7 @@ msgstr ""
 "nesta chave</b>, então as mensagens <b>não podem</b> ser criptografadas. Use "
 "seu cliente de GPG para validar esta chave."
 
-#: ../src/dialogs.py:4432
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7254,20 +7327,20 @@ msgstr "Descrição"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3289
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Marcador já configurado"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3290
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" já existe nos marcadores."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3303
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Marcador foi adicionado com sucesso"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3304
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Você pode gerenciar seus marcadores pelo menu de ações na janela principal."
@@ -7738,27 +7811,27 @@ msgstr "O Gajim necessita do servidor X para rodar. Encerrando..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:180
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "O Gajim necessita do PyGTK 2.12 ou superior"
 
-#: ../src/gajim.py:172
+#: ../src/gajim.py:181
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "O Gajim necessita do PyGTK 2.12 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:183
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "O Gajim necessita do GTK 2.12 ou superior"
 
-#: ../src/gajim.py:175
+#: ../src/gajim.py:184
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "O Gajim necessita do GTK 2.12 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Não existe suporte para libglade no GTK+ runtime"
 
-#: ../src/gajim.py:182
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7767,22 +7840,22 @@ msgstr ""
 "Por favor remova seu GTK+ runtime atual e instale a última versão estável de "
 "%s"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Por favor certifique-se de que o GTK+ e o PyGTK tem suporte ao libglade em "
 "seu sistema."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita de PySQLite2 para rodar"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa do pywin32 para rodar"
 
-#: ../src/gajim.py:198
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7792,11 +7865,11 @@ msgstr ""
 "pode obtê-lo em %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:353
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "O Gajim já está em execução"
 
-#: ../src/gajim.py:354
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7804,36 +7877,36 @@ msgstr ""
 "Outra instância do Gajim parece estar rodando\n"
 "Executar de qualquer forma?"
 
-#: ../src/gajim.py:439
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/gajim.py:440
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Entre com a frase de acesso da chave GPG %(keyid)s para conta (account %"
 "(account)s)."
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr "A chave GPG expirou"
 
-#: ../src/gajim.py:455
+#: ../src/gajim.py:456
 #, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Sua chave GPG expirou, você será conectado ao %s sem OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:464
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso errada"
 
-#: ../src/gajim.py:465
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, reescreva sua frase secreta de GPG ou pressione Cancelar."
 
-#: ../src/gajim.py:523
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7844,58 +7917,58 @@ msgstr ""
 "outro ocupante.\n"
 "Por favor, especifique um outro apelido abaixo:"
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:543
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Você aceita essa requisição na conta %s?"
 
-#: ../src/gajim.py:548
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorização HTTP (%(method)s) para %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:599 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Falha na conexão"
 
-#: ../src/gajim.py:926 ../src/gajim.py:930
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erro %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:940 ../src/gajim.py:954
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:981 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 msgid "Subscription request"
 msgstr "Solicitação de inscrição"
 
-#: ../src/gajim.py:1006
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gajim.py:1007
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contato \"%s\" autorizou você para ver seu status."
 
-#: ../src/gajim.py:1019
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gajim.py:1020
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7903,78 +7976,78 @@ msgstr ""
 "Você irá sempre ver ele ou ela como desconectado.\n"
 "Você quer removê-lo ou removê-la da sua lista de contatos?"
 
-#: ../src/gajim.py:1045 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 msgid "Unsubscribed"
 msgstr "Desinscrever"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:1276 ../src/groupchat_control.py:1244
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s agora é conhecido como %(new_nick)s"
 
-#: ../src/gajim.py:1301 ../src/groupchat_control.py:1429
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s agora está %(status)s"
 
-#: ../src/gajim.py:1368
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s alterou o assunto para %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1432 ../src/groupchat_control.py:1184
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
 
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "A sala agora mostra membros indisponíveis"
 
-#: ../src/gajim.py:1437
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "a sala agora não mostra membros indisponíveis"
 
-#: ../src/gajim.py:1440
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Uma modificação na configuração da sala que não tem relação com privacidade "
 "ocorreu"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1443
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "A gravação das conversas da sala está ativo agora"
 
-#: ../src/gajim.py:1445
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "A gravação das conversas da sala está desligado agora"
 
-#: ../src/gajim.py:1447
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Agora a sala é não-anônima"
 
-#: ../src/gajim.py:1450
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Agora a sala é semi-anônima"
 
-#: ../src/gajim.py:1453
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Agora a sala é totalmente anônima"
 
-#: ../src/gajim.py:1485
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Uma senha é requerida para ingressar na sala %s. Por favor, digite-a."
 
-#: ../src/gajim.py:1519
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7982,24 +8055,24 @@ msgstr ""
 "Você configurou o Gajim para usar o agente do GPG, mas não há agente do GPG "
 "rodando ou então ele retornou uma frase secreta incorreta.\n"
 
-#: ../src/gajim.py:1521 ../src/gajim.py:1527
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gajim.py:1522
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:1526
+#: ../src/gajim.py:1533
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:1552
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr "Chave GPG não confiável"
 
-#: ../src/gajim.py:1552
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -8007,14 +8080,14 @@ msgstr ""
 "A chave GPG usada para criptografar esta conversa não é confiável. Você "
 "realmente deseja criptografar esta mensagem?"
 
-#: ../src/gajim.py:1554 ../src/gajim.py:2214 ../src/gajim.py:2249
-#: ../src/groupchat_control.py:1667 ../src/message_window.py:221
-#: ../src/roster_window.py:2600 ../src/roster_window.py:3241
-#: ../src/roster_window.py:3897
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Não me pergunte novamente"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
@@ -8022,19 +8095,19 @@ msgstr ""
 "O Gnome Keyring está instalado mas não \t\t\t\tiniciou corretamente "
 "(provavelmente a variável de ambiente não \t\t\t\testá corretamente definida)"
 
-#: ../src/gajim.py:1674
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novo email em %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1676
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Você tem %d nova mensagem de email"
 msgstr[1] "Você tem %d novas mensagens de email"
 
-#: ../src/gajim.py:1689
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8049,44 +8122,44 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1760
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo."
 
-#: ../src/gajim.py:1798 ../src/roster_window.py:1792
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Remover contato da lista"
 
-#: ../src/gajim.py:1800 ../src/roster_window.py:1794
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gajim.py:1831
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1835
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: ../src/gajim.py:1848
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Você enviou com sucesso o %(filename)s para %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1852
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s para %(name)s parado."
 
-#: ../src/gajim.py:1950
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8095,36 +8168,36 @@ msgstr ""
 "Não foi possível descriptografar a mensagem de %s\n"
 "Ela pode ter sido adulterada."
 
-#: ../src/gajim.py:1957
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Não foi possível descriptografar a mensagem"
 
-#: ../src/gajim.py:2031
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Conflito de nome de usuário"
 
-#: ../src/gajim.py:2032
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Por favor digite um novo nome de usuário para sua conta local"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2057
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2068
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Erro."
 
-#: ../src/gajim.py:2093
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Conflito de recurso"
 
-#: ../src/gajim.py:2094
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8132,11 +8205,11 @@ msgstr ""
 "Você já está conectado a essa conta com o mesmo recurso. Por favor digite um "
 "novo"
 
-#: ../src/gajim.py:2153
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Erro ao verificar o certificado SSL"
 
-#: ../src/gajim.py:2154
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8147,15 +8220,15 @@ msgstr ""
 "(error)s\n"
 "Você ainda deseja conectar-se a este servidor?"
 
-#: ../src/gajim.py:2159
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este erro para este certificado."
 
-#: ../src/gajim.py:2179
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Erro de certificado SSL"
 
-#: ../src/gajim.py:2180
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8172,11 +8245,11 @@ msgstr ""
 "\n"
 "Você ainda quer conectar e atualizar o fingerprint do certificado?"
 
-#: ../src/gajim.py:2210 ../src/gajim.py:2245
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: ../src/gajim.py:2211
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8184,11 +8257,11 @@ msgstr ""
 "Você está prestes a enviar sua senha em um conexão não-criptografada. Tem "
 "certeza que quer fazer isto?"
 
-#: ../src/gajim.py:2213 ../src/gajim.py:2248
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sim, eu realmente quero me conectar de modo não-seguro"
 
-#: ../src/gajim.py:2246
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8196,21 +8269,21 @@ msgstr ""
 "Você está enviando sua senha em uma conexão não-segura. Você deve instalar o "
 "PyOpenSSL para prevenir isto. Você tem certeza que quer fazer isso?"
 
-#: ../src/gajim.py:2266
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "O nó PEP não foi removido"
 
-#: ../src/gajim.py:2267
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "O nó PEP %(node)s não foi removido: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2761 ../src/gajim.py:2783
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Emoticons desabilitados"
 
-#: ../src/gajim.py:2762
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8218,7 +8291,7 @@ msgstr ""
 "Você configurou um tema de emoticons que não foi encontrado, então os "
 "emoticons estão desativados."
 
-#: ../src/gajim.py:2784
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8228,13 +8301,13 @@ msgstr ""
 "precisar atualizar o formato do arquivo emoticons.py. Veja http://trac.gajim."
 "org/wiki/Emoticons para mais detalhes."
 
-#: ../src/gajim.py:2810 ../src/roster_window.py:3381
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Você não pode ingressar em uma sala enquanto estiver invisível"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3180
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
@@ -8699,151 +8772,151 @@ msgstr "Você não pode apagar o seu tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
-#: ../src/groupchat_control.py:159
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:161
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Você não está mais na sala da conversa \"%(room)s\" ou \"%(nick)s\" saiu."
 
-#: ../src/groupchat_control.py:431
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Inserir apelido"
 
-#: ../src/groupchat_control.py:590
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Conversação com "
 
-#: ../src/groupchat_control.py:592
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Conversação continuada"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1187
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "A gravação das conversas da sala está ligado"
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: ../src/groupchat_control.py:1192
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "O servidor atribuiu ou modificou o apelido da sua sala"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1198
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:1202
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi chutado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1228 ../src/groupchat_control.py:1321
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:1282 ../src/groupchat_control.py:1286
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi removido da sala (%(reason)s)"
 
-#: ../src/groupchat_control.py:1283
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "filiação alterada"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "a configuração da sala mudou para aceitar apenas membros"
 
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "desligamento do sistema"
 
-#: ../src/groupchat_control.py:1370
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** A afiliação de %(nick)s foi alterada para %(affiliation)s por %(actor)s"
 
-#: ../src/groupchat_control.py:1374
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** A afiliação de %(nick)s foi alterado para %(affiliation)s"
 
-#: ../src/groupchat_control.py:1389
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** O cargo de %(nick)s foi definido para %(role)s por %(actor)s"
 
-#: ../src/groupchat_control.py:1393
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** O cargo de %(nick)s foi definido para %(role)s"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou na conferência"
 
-#: ../src/groupchat_control.py:1661
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Você tem certeza que quer deixar a conferência \"%s\"?"
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se você fechar esta janela, será desconectado desta conferência."
 
-#: ../src/groupchat_control.py:1700
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Mudando assunto"
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Mudando apelido"
 
-#: ../src/groupchat_control.py:1709
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique o novo apelido que você quer usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1738
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Excluindo %s"
 
-#: ../src/groupchat_control.py:1739
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8851,22 +8924,22 @@ msgstr ""
 "Você está prestes a excluir definitivamente esta sala.\n"
 "Você deve especificar uma justificativa abaixo:"
 
-#: ../src/groupchat_control.py:1741
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Você também pode entrar com um ponto de encontro alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1884
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:1885 ../src/groupchat_control.py:2190
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2189
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -8939,6 +9012,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Nova conferência"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Eu gostaria de adiciona-lo à minha lista"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Não foi encontrado banco de dados do histórico de logs"
@@ -9021,27 +9102,27 @@ msgstr "Histórico de conversação com %s"
 msgid "Disk Error"
 msgstr "Erro de disco"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s é agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:435
+#: ../src/history_window.py:438
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Mensagem de erro: %s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:440
 #, fuzzy
 msgid "Error"
 msgstr "Erro."
 
-#: ../src/history_window.py:439
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status agora é: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:442
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
@@ -9054,27 +9135,27 @@ msgstr "Tempo esgotado ao carregar a imagem"
 msgid "Image is too big"
 msgstr "A imagem é grande demais"
 
-#: ../src/message_window.py:219
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Você está prestes a fechar todas as abas"
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Você realmente deseja fechar todas?"
 
-#: ../src/message_window.py:457
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Conversas"
 
-#: ../src/message_window.py:459
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Conferências"
 
-#: ../src/message_window.py:461
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Conversas privadas"
 
-#: ../src/message_window.py:467
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Mensagens"
 
@@ -9134,18 +9215,18 @@ msgstr "Ignorar"
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2801
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "O arquivo está vazio"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2804
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2806 ../src/roster_window.py:2817
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
@@ -9176,46 +9257,46 @@ msgid ""
 msgstr ""
 "Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
 
-#: ../src/roster_window.py:279 ../src/roster_window.py:966
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:1847
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1848
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1868
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1869
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o status dele ou dela."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG não é usável"
 
-#: ../src/roster_window.py:2107 ../src/roster_window.py:3332
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:2108 ../src/roster_window.py:3333
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9223,28 +9304,28 @@ msgstr ""
 "Mudando seu status para invisível resulta na desconexão daquelas "
 "conferências. Você tem certeza que quer ir invisível?"
 
-#: ../src/roster_window.py:2134
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "não sincronizado"
 
-#: ../src/roster_window.py:2190
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2191
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Você tem certeza que quer deixar a conferência \"%s\"?"
 
-#: ../src/roster_window.py:2192
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2283 ../src/roster_window.py:2520
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:2284
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9252,16 +9333,16 @@ msgstr ""
 "Mensagens somente estarão disponíveis para leitura mais tarde se você tiver "
 "o histórico habilitado e contato na sua lista."
 
-#: ../src/roster_window.py:2521
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Você precisa lê-los antes de remover este transporte."
 
-#: ../src/roster_window.py:2524
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9269,11 +9350,11 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: ../src/roster_window.py:2528
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Os transportes serão removidos"
 
-#: ../src/roster_window.py:2533
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9282,69 +9363,69 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens para contatos destes "
 "transportes: %s"
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2662
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
 
-#: ../src/roster_window.py:2597
+#: ../src/roster_window.py:2664
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2681
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Renomear contato"
 
-#: ../src/roster_window.py:2682
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entre com um novo apelido para o contato %s"
 
-#: ../src/roster_window.py:2689
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: ../src/roster_window.py:2690
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entre com um novo nome para o grupo %s"
 
-#: ../src/roster_window.py:2747
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Você quer remover o grupo %s da lista?"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Também remove todos os contatos neste grupo da sua lista"
 
-#: ../src/roster_window.py:2788
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2789
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3154
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Você realmente deseja remover \"%(name)s\" (%(jid)s) da sua lista.\n"
 
-#: ../src/roster_window.py:3159
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9353,11 +9434,11 @@ msgstr ""
 "ele ou ela sempre o verá offiline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3165
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: ../src/roster_window.py:3168
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9365,16 +9446,16 @@ msgstr ""
 "Removendo este contato, você também, por padrão, removerá a autorização, "
 "resultando em ele ou ela sempre o verá offiline."
 
-#: ../src/roster_window.py:3171
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Eu quero que este contato saiba meu status após a remoção"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3175
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Os contatos serão removidos da sua lista"
 
-#: ../src/roster_window.py:3180
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9384,34 +9465,34 @@ msgstr ""
 "você também remove a autorização fazendo com que eles sempre vejam você "
 "offline."
 
-#: ../src/roster_window.py:3235
+#: ../src/roster_window.py:3286
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
 
-#: ../src/roster_window.py:3237
+#: ../src/roster_window.py:3288
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3254
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:3255
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Você deve configurar uma conta antes de poder conversar com outros contatos."
 
-#: ../src/roster_window.py:3804
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor"
 
-#: ../src/roster_window.py:3806
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9419,13 +9500,13 @@ msgstr ""
 "O seu servidor não suporta a gravação de informação de metacontatos, então "
 "essas informações não estarão salvas na próxima vez que você conectar."
 
-#: ../src/roster_window.py:3891
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
 
-#: ../src/roster_window.py:3893
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9435,23 +9516,23 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas de Jabber "
 "ou transportes."
 
-#: ../src/roster_window.py:4008
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Arquivo URI inválido:"
 
-#: ../src/roster_window.py:4019
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Você quer enviar este arquivo para %s:"
 msgstr[1] "Você quer enviar estes arquivos para %s:"
 
-#: ../src/roster_window.py:4124
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4130
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Fazer %s e %s metacontatos"
@@ -9461,130 +9542,127 @@ msgstr "Fazer %s e %s metacontatos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4713 ../src/roster_window.py:4784
-#: ../src/roster_window.py:4793 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
 #. add
-#: ../src/roster_window.py:4800
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
 #. disco
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
-#: ../src/roster_window.py:4842 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Gerenciar marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4862
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:4902
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:4958 ../src/roster_window.py:5059
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Mudar mensagem de status"
 
-#: ../src/roster_window.py:4985
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Publicar sintonia"
 
-#: ../src/roster_window.py:4993
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Configurar serviços..."
 
-#: ../src/roster_window.py:5147
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maximizar tudo"
 
 #. Send Group Message
-#: ../src/roster_window.py:5155 ../src/roster_window.py:5685
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Enviar m_ensagem de grupo"
 
-#: ../src/roster_window.py:5163
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Para todos os usuários"
 
-#: ../src/roster_window.py:5167
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Para todos os usuários conectados"
 
-#: ../src/roster_window.py:5582
-msgid "I would like to add you to my roster"
-msgstr "Eu gostaria de adiciona-lo à minha lista"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Gerenciar contatos"
 
 #. Edit Groups
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5432
 msgid "Edit _Groups"
 msgstr "Editar _grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5766
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Enviar mensagem simples"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Executar comando..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5822
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Gerenciar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5830
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
 #. Rename
-#: ../src/roster_window.py:5839
+#: ../src/roster_window.py:5558
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:5904
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5912
+#: ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:5918
+#: ../src/roster_window.py:5637
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:5998
-msgid "_New Group Chat"
-msgstr "_Nova conferência"
-
 #. History manager
-#: ../src/roster_window.py:6111
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Gerenciador de histórico"
 
-#: ../src/roster_window.py:6120
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Ingressar em uma nova Conferência"
 
-#: ../src/roster_window.py:6276
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Mudar mensagem de status..."
 
@@ -9601,20 +9679,20 @@ msgstr "Erro no formulário de dados recebido"
 msgid "No result"
 msgstr "Sem resultados"
 
-#: ../src/session.py:127
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Erro ao escrever em disco"
 
-#: ../src/session.py:248
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Assunto: %s"
 
-#: ../src/session.py:421 ../src/session.py:456
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Confirme essas opções de sessão"
 
-#: ../src/session.py:423
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9629,7 +9707,7 @@ msgstr ""
 "\n"
 "\tEssas opções são aceitáveis?"
 
-#: ../src/session.py:457
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9825,6 +9903,9 @@ msgstr "Não há requisições de inscrições pendentes."
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Ativar mensagens \"link-local\"/\"zeroconf\""
+
 #~ msgid "B_OSH Port:"
 #~ msgstr "Porta B_OSH:"
 
diff --git a/po/ru.po b/po/ru.po
index 0fb77d7ec..b0d993307 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-20 00:02+0200\n"
 "Last-Translator: Fomin Denis <fominde@mail.ru>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -221,6 +221,7 @@ msgstr "<b>Личная информация</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Учетные записи"
 
@@ -288,8 +289,8 @@ msgstr "Редактировать личную информацию..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -300,8 +301,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Общие"
 
@@ -361,25 +362,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Информация о вас, сохраненная на сервере"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Нет"
 
@@ -535,8 +532,8 @@ msgstr ""
 "Также, возможно, придется изменить некоторые настройки брандмауэра."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -550,7 +547,7 @@ msgid "Mer_ge accounts"
 msgstr "_Объединить учетные записи"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "П_ереименовать"
 
@@ -803,7 +800,7 @@ msgid "All statuses"
 msgstr "Все статусы"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Ушел"
 
@@ -820,7 +817,7 @@ msgid "Have "
 msgstr "Есть "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Невидимка"
 
@@ -829,7 +826,7 @@ msgid "Launch a command"
 msgstr "Выполнить команду"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Недоступен"
 
@@ -1015,7 +1012,7 @@ msgid "Join _Group Chat"
 msgstr "Войти в _комнату"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Добавить в ростер"
 
@@ -1041,39 +1038,6 @@ msgstr "_Просмотреть ссылку в браузере"
 msgid "_Start Chat"
 msgstr "_Начать беседу"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Пригласить _участников"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Отправить _файл"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Включить End to End шифрование"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Включить Open_PGP шифрование"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Добавить в ростер"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_История"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "_Пригласить"
@@ -1098,6 +1062,119 @@ msgstr ""
 "Вы собираетесь начать чат (Multi-User Chat).\n"
 "Выберите контакты, которых вы хотите пригласить"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "_Попросить возможность видеть его или её статус"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Добавить специальное _уведомление"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Назначить ключ Open_PGP"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Выполнить команду..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Редактировать _группы"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "_Пригласить в"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Пригласить _участников"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "_Удалить"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Установи_ть статус"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Отправить одиночное _сообщение..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Отправить _файл..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Установить _аватар..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Начать _беседу"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Включить End to End шифрование"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Включить Open_PGP шифрование"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Позволить ему или ей видеть мой статус"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Блокировать"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Запретить ему или ей видеть мой статус"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_История"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Игнорировать"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Управление контактом"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "П_ереименовать"
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Подписка"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Разблокировать"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Прекратить игнорирование"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Заполните форму."
@@ -1214,7 +1291,7 @@ msgstr ""
 "Контакт\n"
 "Баннер в окне чата"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Полужирный"
 
@@ -1238,7 +1315,7 @@ msgstr "Ушел"
 msgid "Inactive"
 msgstr "Неактивен"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1308,6 +1385,14 @@ msgstr "_Модератор"
 msgid "Occupant Actions"
 msgstr "Действия над посетителем"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Отправить _файл"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Добавить в ростер"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Админ"
@@ -1316,13 +1401,6 @@ msgstr "_Админ"
 msgid "_Ban"
 msgstr "_Забанить"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Блокировать"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Выгнать"
@@ -1339,13 +1417,6 @@ msgstr "_Владелец"
 msgid "_Send Private Message"
 msgstr "_Отправить личное сообщение"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Разблокировать"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Право говорить"
@@ -1354,7 +1425,7 @@ msgstr "_Право говорить"
 msgid "Create new post"
 msgstr "Создать новое сообщение"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "От"
 
@@ -1379,8 +1450,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добро пожаловать в менеджер истории Gajim'а</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1434,34 +1505,39 @@ msgstr "Поиск:"
 msgid "_Log conversation history"
 msgstr "_История сообщения"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Добавить комнату в закладки (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Войти в комнату"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Автовход в комнату при подключении"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Ник:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Недавно:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Комната:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Присоединиться"
@@ -1490,7 +1566,7 @@ msgstr "Сворачивать при автовходе"
 msgid "Print status:"
 msgstr "Показывать статус:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -2022,7 +2098,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Сортировать контакты по статусу"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Статус"
 
@@ -2192,34 +2268,39 @@ msgid "All"
 msgstr "всем"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "всем с подпиской"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Разрешить"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Отклонить"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Номер:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Список доступа"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "всем с подпиской"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "всем в группе"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2231,19 +2312,19 @@ msgstr ""
 "от\n"
 "к"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "посылать мне сообщения"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "посылать мне запросы"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "посылать мне свой статус"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "видеть мой статус"
 
@@ -2411,96 +2492,11 @@ msgstr "Удалить учетную запись из Gajim и с _серве�
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "_Попросить возможность видеть его или её статус"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Добавить специальное _уведомление"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Назначить ключ Open_PGP"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Редактировать _группы"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Выполнить команду..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "_Пригласить в"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "_Удалить"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Установи_ть статус"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Отправить одиночное _сообщение..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Отправить _файл..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Установить _аватар..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Начать _беседу"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Позволить ему или ей видеть мой статус"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Запретить ему или ей видеть мой статус"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Игнорировать"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Управление контактом"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "П_ереименовать"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Подписка"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Прекратить игнорирование"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2619,7 +2615,7 @@ msgid "_Add contact"
 msgstr "Добавить _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Информация о контакте"
 
@@ -2831,26 +2827,6 @@ msgstr "_Сообщение"
 msgid "_Presence"
 msgstr "_Присутствие"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Добавить специальное _уведомление"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Назначить ключ  Open_PGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Редактировать _группы"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "П_ереименовать"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Изменить учетную запись..."
@@ -2895,48 +2871,48 @@ msgid "Service returned an error."
 msgstr "Сервис ответил ошибкой."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Активно"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Неактивно"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Булево"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Целое"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Цвет"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Название опции"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Значение"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Нет)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Скрытый"
 
@@ -2950,185 +2926,184 @@ msgstr "Получена новая запись:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Английский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Белорусский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Болгарский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Бретонский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Чешский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Немецкий"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Греческий"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Британский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Испанский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Баскский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Французский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Хорватский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Итальянский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Норвежский (букмол)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Голландский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Норвежский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Польский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Португальский (Бразилия)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Русский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Сербский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Словацкий"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Шведский"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Китайский"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Язык проверки орфографии"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 msgid "Underline"
 msgstr "Подчеркнутый"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 msgid "Strike"
 msgstr "Зачеркнутый"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 msgid "Clear formating"
 msgstr "Удалить форматирование"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Отправить файл?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Если вы пошлете файл %s, он/она узнает ваш настоящий Jabber ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG шифрование включено"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Не в ростере"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 msgid "This contact does not support file transfer."
 msgstr "Этот контакт не поддерживает передачу файлов."
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Необходимо знать настоящий JID контакта для того, чтобы отправить ему или ей "
 "файл."
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Неизвестный исполнитель"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Неизвестная песня"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Неизвестный альбом"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3137,17 +3112,17 @@ msgstr ""
 "<b>«%(title)s»</b> <i>%(artist)s</i>\n"
 "из <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s из комнаты %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Ключ GPG не присвоен"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3155,50 +3130,50 @@ msgstr ""
 "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
 "сообщения с помощью GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG шифрование выключено"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Для сеанса БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Для сеанса НЕ БУДЕТ сохранена история сообщений"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "было"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "НЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "будет"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "НЕ будет"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "и заверено"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "и НЕ заверено"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3207,66 +3182,23 @@ msgstr ""
 "%(type)s шифрование %(status)s включено %(authenticated)s.\n"
 "Для сеанса %(logged)s сохранена история сообщений."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Команда не поддерживается учетной записью zeroconf."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Команды: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Использование: /%s, очищает текстовое окно."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Использование: /%s, скрывает кнопки беседы."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Использование: /%(command)s <действие>, совершает действие в текущей "
-"комнате. Используйте третье лицо (например, «/%(command)s взрывается».)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Использование: /%s, посылает пинг контакту"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Использование: /%s, посылает сообщение контакту"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Нет подсказки для /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Установление сеанса отменено"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Сеанс зашифрован"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " и БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " и НЕ БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3274,25 +3206,25 @@ msgstr ""
 "Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для "
 "подробностей."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E шифрование выключено"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Последнее сообщение зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Получено новое сообщение от «%s»"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3300,15 +3232,15 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет утеряно."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Ошибка базы данных"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3317,7 +3249,7 @@ msgstr ""
 "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его "
 "или удалить (вся история будет утеряна)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s теперь %(status)s"
@@ -3326,23 +3258,23 @@ msgstr "%(name)s теперь %(status)s"
 msgid "creating logs database"
 msgstr "создается БД истории"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s должен быть директорией, а не файлом"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Закончить работу"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s должен быть файлом, а не директорией"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "создается директория %s"
@@ -3406,9 +3338,9 @@ msgstr "Выберите конференции, которые вы хотит�
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Комнаты"
 
@@ -3424,74 +3356,113 @@ msgstr "Переслать непрочитанные сообщения"
 msgid "All unread messages have been forwarded."
 msgstr "Все непрочитанные сообщения отправлены."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr "Проигрывать звуки, когда пользователь занят"
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Использовать DBus и Notification Daemon для показа уведомлений"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 "Показывать в ростере только контакты со статусами «Доступен» и «Готов "
 "поболтать»."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Время в минутах, после которого ваш статус изменится на Отошел."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Автостатус 'Отошел' по причине бездействия более $T мин)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr "$S будет замещено текущим сообщением о статусе, $T — временем простоя."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Время в минутах, после которого ваш статус изменится на Недоступен."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Автостатус 'Недоступен' по причине бездействия более $T мин)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S будет замещено текущим сообщением о статусе, $T — временем простоя."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Когда показывать иконку в системном лотке. Возможные значения  'never', "
 "'on_event', 'always'."
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Неверное имя пользователя"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "текст сообщения о статусе"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Неверное имя пользователя"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Смена ника"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "текст сообщения о статусе"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "По_умолчанию"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr ""
-"Приём и отправка локальных (link-local) сообщений и сообщений в сетях "
-"zeroconf"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Язык, используемый при проверке правописания"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3501,7 +3472,7 @@ msgstr ""
 "«sometimes» — печатать время каждые несколько минут.\n"
 "«never» — не печатать время."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3512,18 +3483,18 @@ msgstr ""
 "Используется только если режим печати времени установлен на "
 "«sometimes» (иногда)."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Обрабатывать пары * / _ как возможные форматирующие символы."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Если активно, то не будут удаляться */_. Так что *фыва* будет написано "
 "полужирным шрифтом, но * * удалены не будут"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3534,7 +3505,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.htm (Если вы хотите "
 "воспользоваться этой опцией, установите docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3542,7 +3513,7 @@ msgstr ""
 "Символ, который нужно добавлять к нику, когда используется дополнение (tab) "
 "в комнате."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3550,7 +3521,7 @@ msgstr ""
 "Символ, который будет добавляться после ника, когда желаемый ник уже занят "
 "кем-нибудь в комнате."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3560,19 +3531,19 @@ msgstr ""
 "К примеру «[%H:%M]» будет показано как «[чч:мм]». Смотрите дополнительно "
 "документацию python к strftime (http://docs.python.org/lib/module-time.html)"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Символы, которые будут отображаться перед никами в чате."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Символы, которые будут отображаться после ников в чате"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Добавлять * и [n] в окно ростера?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3580,11 +3551,25 @@ msgstr ""
 "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются "
 "вновь."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Сколько минут должны оставаться последние строки из предыдущей беседы."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3592,11 +3577,11 @@ msgstr ""
 "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в "
 "Mirabilis ICQ)"
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Сколько строк хранить для Ctrl+Стрелка вверх"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3605,13 +3590,13 @@ msgstr ""
 "Введите свою ссылку с %s, в которой %s подменяет слово/фразу, или "
 "«WIKTIONARY», чтобы использовать Викисловарь."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием "
 "gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3624,14 +3609,14 @@ msgstr ""
 "listen_to_network_manager и они должны синхронизировать свой статус с "
 "глобальным)"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Отсылать уведомления о состоянии беседы. Варианты: all (все), composing_only "
 "(только печать), disabled (никаких уведомлений)."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3639,7 +3624,7 @@ msgstr ""
 "Отображать состояния беседы в окне беседы. Варианты: all (все), "
 "composing_only (только печать), disabled (никаких уведомлений)."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3647,11 +3632,11 @@ msgstr ""
 "Если отключена печать времени для каждого сообщения, то печатать его каждые "
 "X минут."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3659,7 +3644,7 @@ msgstr ""
 "Всегда спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
 "Комнаты в списке разделяются пробелом."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3667,7 +3652,7 @@ msgstr ""
 "Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
 "Комнаты в списке разделяются пробелом."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
@@ -3676,7 +3661,7 @@ msgstr ""
 "элемент, который может потерять данные (разговор, личный разговор, разговор "
 "в комнате, которые не будут свёрнуты)"
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3685,27 +3670,27 @@ msgstr ""
 "локальным интерфейсам при передаче файлов в случае, если мы за NAT или "
 "используется перенаправление портов."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандарт утверждает, что KiB = 1024 байт, KB = 1000 байт"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Уведомлять о событиях в системном лотке."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Показывать вкладку при одном чат-окне?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показывать границу вкладки в окне чата?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3717,17 +3702,17 @@ msgstr ""
 "14, 15, 16, 17 и 18. Более высокие числа безопаснее, но требуют более "
 "длительных вычислений при начале сеанса."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Предпросмотр новых сообщений во всплывающем окне?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3735,14 +3720,14 @@ msgstr ""
 "Если активно, то Gajim будет завершаться при нажатии на кнопку закрытия "
 "окна. Эта опция учитывается, только если используется иконка для трея."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Если активно, то Gajim будет проверять при запуске, является ли он jabber-"
 "клиентом по умолчанию."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3750,7 +3735,7 @@ msgstr ""
 "Если активно, то Gajim отображает иконку на каждой вкладке, которая содержит "
 "непрочитанные сообщения. В зависимости от темы, она может быть анимированной."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3758,11 +3743,11 @@ msgstr ""
 "Если активно то Gajim будет отображать сообщение о статусе, если оно не "
 "пустое, для каждого контакта под именем контакта в окне ростера"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Определяет позицию аватар в ростере. Может быть left или right"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3770,7 +3755,7 @@ msgstr ""
 "Если активно, то Gajim будет запрашивать аватару для каждого контакта, у "
 "которого её не было в последний раз или она уже слишком старая."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3778,7 +3763,7 @@ msgstr ""
 "Если неактивно, то Gajim больше не будет показывать строку статуса в окне "
 "беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3793,28 +3778,28 @@ msgstr ""
 "«in_and_out», то Gajim будет выводить сообщение только когда кто-то входит "
 "или выходит из комнаты."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Фоновый цвет контакта, который только что вошел."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Фоновый цвет контакта, который только что вышел."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "Если активно, то восстановленные сообщения будут иметь меньший шрифт."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Не показывать аватар для транспорта."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Не показывать ростер в панели задач."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3824,7 +3809,7 @@ msgstr ""
 "мигать (поведение по умолчанию для большинства менеджеров окон) когда "
 "присутствуют не просмотренные события."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3835,7 +3820,7 @@ msgstr ""
 "данных в информации для комнат"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3855,31 +3840,31 @@ msgstr ""
 "свое окно. Заметьте, что при изменении этого параметра требуется перезапуск "
 "Gajim, чтобы изменения вступили в силу."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Если неактивно, вы больше не будете видеть аватары в окне беседы."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Если активно, то нажатие клавиши Escape будет закрывать вкладку/окно."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Скрывает кнопки в окнах чата."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Скрывает баннер в окне комнаты"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Скрывает баннер в окне чата"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Скрывает список посетителей в окне комнаты."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3887,17 +3872,17 @@ msgstr ""
 "Показывать ник в начале строки в чате только если предыдущее сообщение было "
 "написано другим участником."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Разделитель, используемый при активированной настройке "
 "chat_merge_consecutive_nickname."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавно прокручивать сообщения в окне чата"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3905,13 +3890,13 @@ msgstr ""
 "Список цветов, разделенных  «:» которые будут использоваться для раскраски "
 "ников в комнатах."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Использовать Ctrl-Tab, чтобы перейти к следующей вкладке с составляемым "
 "сообщением, когда нет непрочитанных сообщений."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3919,7 +3904,25 @@ msgstr ""
 "Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая "
+"строка означает, что сообщение не будет показываться вообще."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая "
+"строка означает, что сообщение не будет показываться вообще."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3930,7 +3933,7 @@ msgstr ""
 "если вы подключитесь с отрицательным приоритетом, то вы НЕ получите никаких "
 "сообщений от сервера."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3938,7 +3941,7 @@ msgstr ""
 "Если активно, Gajim будет использовать (если возможно) Gnome Keyring для "
 "хранения паролей учетных записей."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3947,7 +3950,7 @@ msgstr ""
 "Если активно, Gajim будет использовать (если возможно) Gnome Keyring для "
 "хранения паролей учетных записей."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3955,7 +3958,7 @@ msgstr ""
 "Если активно, Gajim будет показывать количество контактов онлайн/всего в "
 "строках с названием учетной записи и групп."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3963,7 +3966,7 @@ msgstr ""
 "Может быть пусто, 'chat' или 'normal'. Если не пусто — обрабатывать все "
 "входящие сообщения так, как будто бы они были этого типа."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3971,7 +3974,7 @@ msgstr ""
 "Если активно, Gajim прокрутит ростер и выделит контакт, который написал вам "
 "сообщение последним, если окно чата еще небыло открыто."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3979,17 +3982,17 @@ msgstr ""
 "Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, "
 "используя dvips и конвертировать до вставки его в окно чата."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Время не активности прежде чем окно изменения статуса закроется."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "Максимальное количество строк в окне. Старые строки будут удалены."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3997,17 +4000,17 @@ msgstr ""
 "Если активно, окно уведомления от notification-daemon будет прикреплено к "
 "системному трею."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Выберите интервал между 2 проверками на бездействие."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr "Измените значение для изменения размера отображаемых формул LaTeX."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4015,7 +4018,7 @@ msgstr ""
 "Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» "
 "uri.(mailto и xmpp обрабатываются отдельно)"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
@@ -4025,6 +4028,16 @@ msgstr ""
 "большому количеству посылаемых запросов!"
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4032,7 +4045,7 @@ msgstr ""
 "Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты "
 "для статусов задаются в пункте autopriority_* ."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4040,27 +4053,38 @@ msgstr ""
 "Статус, используемый при автоподключении. Варианты: отключен, в сети, готов "
 "поболтать, отошел, недоступен, не беспокоить, невидимка"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Если включено, восстанавливать последний использованный статус."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Если неактивно, вы больше не будете видеть аватары в окне беседы."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Если отключено, не подписывать присутствие ключом GPG, даже если GPG "
 "настроен."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Включить ESessions шифрование для данной учетной записи."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Должен ли Gajim по возможности автоматически начинать зашифрованный сеанс?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4068,31 +4092,31 @@ msgstr ""
 "Упорядоченный список (разделённый пробелами) типов подключения, которые "
 "будут перепробованы. Может включать tls, ssl или plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
 "через незащищенное соединение."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Предупреждать, прежде чем использовать стандартную библиотеку SSL."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Разделенный пробелами список игнорирования ошибок ssl"
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr "Пробел, посылаемый после бездействия"
 
 # дословно: пинг XMPP послал после бездействия. Возможно, ошибка в оригинале.
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr "пинг XMPP, посылаемый после бездействия"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4101,11 +4125,11 @@ msgstr ""
 "соединения."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Костыль для jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4113,15 +4137,15 @@ msgstr ""
 "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
 "параметре file_transfer_proxies для передачи файлов"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Отвечать на запросы уведомления"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Посылать запросы уведомления"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4129,11 +4153,11 @@ msgstr ""
 "Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что "
 "вы хотите сохранить историю сообщений?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Используется ли для этого контакта OpenPGP?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4141,101 +4165,101 @@ msgstr ""
 "Должен ли Gajim по возможности автоматически начинать для данного контакта "
 "зашифрованный сеанс?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Язык, который используется при проверке правописания"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "все или статусы, разделенные пробелом"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "«yes» (да), «no» (нет) или «both» (оба)"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "«yes» (да), «no» (нет) или «» (пусто)"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Кушаю, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "В кино"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Работаю"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Работаю"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Говорю по телефону"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Вышел"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Я здесь."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Скоро буду."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Меня нет."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Не беспокоить."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4244,98 +4268,98 @@ msgstr ""
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "зеленый"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "овощной"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "телесный"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "морской"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Не могу загрузить модуль «idle»"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Неверный хост"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Неправильный локальный адрес? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Данные о регистрации для транспорта %s не пришли вовремя."
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 msgid "Registration succeeded"
 msgstr "Регистрация завершена"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Регистрация сервиса %s завершена успешно"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 msgid "Registration failed"
 msgstr "Ошибка регистрации"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Регистрация сервиса %(agent)s завершилась ошибкой: %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Ошибка записи на диск"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Невидимость не поддерживается"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Учетная запись %s не поддерживает невидимость."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Было получено сообщение от неверного JID, оно было проигнорировано."
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4345,77 +4369,84 @@ msgstr ""
 "(см. http://trac.gajim.org/wiki/DatabaseBackup) или удалить (вся история "
 "будет утеряна)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Ник недопустим: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Не получается войти в комнату"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вам запрещено входить в комнату %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Комнаты %s не существует."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Создание комнат запрещено."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Необходимо использовать ваш зарегистрированный ник в комнате %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас нет в списке членов комнаты %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Комната была удалена"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Взамен, вы можете присоединиться к комнате: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "теперь мы подписались на %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s хочет отменить подписку"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "теперь мы отписались от %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4425,219 +4456,205 @@ msgstr ""
 "средство управления ростера, например http://jru.jabberstudio.org/, чтобы "
 "удалить его"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Не задана парольная фраза OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Вы будете подключены к %s без использования OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Не удалось получить сертификат издателя"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Не удалось получить сертификат CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Не удалось расшифровать подпись сертификата"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Не удалось расшифровать подпись CRL"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Не удалось расшифровать открытый ключ издателя"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Ошибка подписи сертификата"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Ошибка подписи CRL"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Сертификат ещё не действителен"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Сертификат просрочен"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL ещё не действителен"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL просрочен"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Ошибка в поле notBefore сертификата"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Ошибка в поле notAfter сертификата"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Ошибка в поле «lastUpdate» CRL"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Ошибка в поле «nextUpdate» CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Сертификат подписан самим владельцем."
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Самостоятельно подписанный сертификат в цепочке сертификатов"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Не удалось получить сертификат локального издателя"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Не удалось подтвердить первый сертификат"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Цепочка сертификатов слишком длинная"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Сертификат аннулирован"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Недопустимый сертификат CA"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Превышено ограничение по длине пути"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Неподдерживаемое назначение сертификата"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Сертификат не является доверенным"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Сертификат отклонен"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Несоответствие поставщика сертификата"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификаторы ключа центра сертификации и владельца не совпадают"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Идентификаторы ключа центра сертификации и издателя не совпадают"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Назначение ключа не включает подписывание сертификата"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Ошибка при проверке приложения"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Связь с учетной записью «%s» была потеряна"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Переподключаться вручную."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s предоставил другую регистрационную форму"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестная ошибка SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Неверный ответ"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с «%s»"
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер ответил: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Соединение с прокси разорвалось"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не могу соединиться с %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Связь с учетной записью %s была потеряна.Попытка подключения."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Достоверность сертификата %s может быть недействительной."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4646,7 +4663,7 @@ msgstr ""
 "\n"
 "Ошибка SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4655,24 +4672,24 @@ msgstr ""
 "\n"
 "Неизвестная ошибка SSL: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Проверьте настройки сети или попробуйте еще раз позже"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с «%s»"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Проверьте правильность логина и пароля."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Ошибка при удалении списка доступа"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4681,30 +4698,30 @@ msgstr ""
 "Список доступа %s не может быть удален. Возможно, он используется одним из "
 "ваших активных ресурсов. Отключите ресурс и попробуйте снова."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Не удалось передать сообщение %s — этот JID неверен."
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Ни удаленное присутствие не подписано, ни ключ не присвоен."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "Ключ (%s) контакта не соответствует ключу, присвоенному в Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Это сообщение *зашифровано* (см. :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4713,30 +4730,41 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Пригласить _участников"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Нельзя получить из-за невидимости"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Ошибка регистрации"
+
+#: ../src/common/connection.py:1983
+#, fuzzy, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+"Регистрация сервиса %(agent)s завершилась ошибкой: %(error)s: %(error_msg)s"
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Наблюдатели"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Транспорты"
 
@@ -4745,14 +4773,19 @@ msgid "Not in roster"
 msgstr "Не в ростере"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На компьютере не установлена библиотека D-Bus для Python"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Возможности работы Gajim с D-Bus не могут быть использованы"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "отсутствует библиотека pysqlite2 (или python-pysqlite2). Выход..."
@@ -4828,56 +4861,69 @@ msgid "eleven"
 msgstr "одиннадцать"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, fuzzy, python-format
 msgid "five past %(0)s"
 msgstr "пять минут %(1)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, fuzzy, python-format
 msgid "ten past %(0)s"
 msgstr "десять минут %(1)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "quarter past %(0)s"
 msgstr "четверть %(1)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "twenty past %(0)s"
 msgstr "двадцать минут %(1)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "twenty five past %(0)s"
 msgstr "двадцать пять минут %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, fuzzy, python-format
 msgid "half past %(0)s"
 msgstr "половина %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "без двадцати пяти %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "без двадцати %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "без четверти %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "без десяти %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "без пяти %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s"
 
@@ -4945,190 +4991,190 @@ msgstr "Неверный символ в имени сервера"
 msgid "Invalid character in resource."
 msgstr "Неверный символ в ресурсе"
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Занят"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Занят"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Недоступен"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Готов поболтать"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Готов поболтать"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Доступен"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Доступен"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Соединяюсь"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "_Ушел"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Отключен"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Отключен"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Невидимка"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "Ошибка"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "К"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Оба"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Отсутствует"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Модераторы"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Участники"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Посетитель"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Отсутствует"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Владелец"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "читает сообщение"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "занят чем-то еще"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "печатает сообщение..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "перестал печатать сообщение"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5136,22 +5182,22 @@ msgstr[0] "%d пропущенное сообщение"
 msgstr[1] "%d пропущенных сообщения"
 msgstr[2] "%d пропущенных сообщений"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " в комнате %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " от пользователя %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " от %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5159,12 +5205,12 @@ msgstr[0] "%d событие пропущено"
 msgstr[1] "%d события пропущено"
 msgstr[2] "%d событий пропущено"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim — %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Ошибка выполнения «%(command)s»: %(error)s"
@@ -5180,11 +5226,11 @@ msgstr "%s не является допустимым loglevel"
 msgid "error: cannot open %s for reading"
 msgstr "ошибка: не могу открыть %s для чтения"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "синий"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "переносим журнал на индексы"
 
@@ -5835,7 +5881,7 @@ msgstr ""
 "Возможно, запущен ещё один экземпляр Gajim. Передача файлов будет отменена."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5843,7 +5889,7 @@ msgstr ""
 "[Это часть зашифрованного сообщения. Если вы видите это сообщение, возможно, "
 "произошла ошибка.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5852,16 +5898,28 @@ msgstr ""
 "Хост %s, который настроен как ft_add_hosts_to_send, не действителен, поэтому "
 "игнорируется."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Не задана парольная фраза OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Вы будете подключены к %s без использования OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Требуется переподключение для продолжения приема и отправки сообщений."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Ошибка Avahi"
 
 # link-local это вроде не просто локальный. http://en.wikipedia.org/wiki/Link-local_address
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5870,31 +5928,31 @@ msgstr ""
 "%s\n"
 "Возможно, обмен локальными сообщениями работает не верно."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Удостоверьтесь, что Avahi или Bonjour установлен."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Не могу запустить локальный сервис"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не могу использовать порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Удостоверьтесь, что демон avahi запущен."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не могу изменить статус учётной записи «%s»"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5902,20 +5960,20 @@ msgstr ""
 "Вы не подключены или невидимы для других. Ваше сообщение нельзя отправить."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Это сообщение зашифровано]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Ваше сообщение не может быть отправлено."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт не в сети. Отправить сообщение не удалось."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Не удалось соединиться с хостом: истекло время ожидания."
@@ -5926,24 +5984,24 @@ msgstr "Не удалось соединиться с хостом: истекл
 msgid "Error while adding service. %s"
 msgstr "Ошибка при добавлении службы. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Отключены"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Сообщение по умолчанию"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Нет словаря для языка %s"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5952,211 +6010,217 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
 "s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "заголовок сообщения о статусе"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "текст сообщения о статусе"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Переподключиться сейчас?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Если вы хотите, чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 msgid "OpenPGP is not usable on this computer"
 msgstr "Невозможно использовать OpenPGP на этом компьютере"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Непросмотренные события"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "У вас есть окна чата под учётной записью %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для смены имени учетной записи необходимо просмотреть ожидающие события."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Это имя уже используется в другой вашей учетной записи. Выберите другое."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Переименовать учетную запись"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введите новое название для учетной записи %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат «имя_пользователя@сервер»."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Возникла проблема с получением вашего секретного ключа OpenPGP."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Выбор ключа OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой ключ OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Чтобы отредактировать личную информацию, нужно подключиться к серверу."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Сервер не поддерживает Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не может хранить личную информацию."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Для смены имени учетной записи необходимо отключиться."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Учётная запись Local уже существует."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Черный список"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Список участников"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Список владельцев"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Список администраторов"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Обязанность"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Баню..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6164,11 +6228,11 @@ msgstr ""
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6176,11 +6240,11 @@ msgstr ""
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6188,11 +6252,11 @@ msgstr ""
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6200,7 +6264,7 @@ msgstr ""
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6216,58 +6280,58 @@ msgstr ""
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись «%s» подключена к серверу"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Все"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:Нет"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Новая комната"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6275,66 +6339,65 @@ msgstr ""
 "эту закладку."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Ник недопустим: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Неверный сервер"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Неверная запись"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Вы можете установить расширенные настройки учетной записи нажатием кнопки "
 "«Дополнительно», или сделать это позже посредством пункта «Учетные записи» "
 "меню «Правка» в главном окне программы."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Укажите сервер, на котором вы хотите зарегистрироваться."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Сертификат уже находится в файле"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6349,7 +6412,7 @@ msgstr ""
 "Ошибка SSL: %(error)s\n"
 "Соединиться с этим сервером?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6360,63 +6423,63 @@ msgstr ""
 "Отпечаток SHA1 сертификата:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Следующее сообщение получено в окне с фокусом"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Следующее сообщение получено в окне без фокуса"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Контакт подключился"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в комнате"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Получено письмо на Gmail"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6426,7 +6489,7 @@ msgstr ""
 "Если иконка не пропадает долгое время,\n"
 "это означает, что сообщение потеряно."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6434,73 +6497,73 @@ msgstr ""
 "Текст под этой линией был сказан после того,\n"
 "как вы последний раз заглядывали в эту комнату"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 msgid "_Quote"
 msgstr "_Цитировать"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия для «%s»"
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _словаре"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "В URL словаря отсутствует «%s» и это не WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "В URL Web-поиска отсутствует  «%s»"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Открыть как _ссылку"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i дней назад"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Jabber ID уже в списке"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber ID, который вы ввели, уже существует. Выберите другой."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6535,119 +6598,119 @@ msgstr "Имя контакта"
 msgid "Set Mood"
 msgstr "Установить настроение"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Сообщение о статусе %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Сообщение о статусе"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Изменить сообщение о статусе?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Это имя уже используется. Перезаписать это сообщение о статусе?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Сохранить установленное сообщение о статусе"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Введите имя для этого сообщения о статусе"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "Адрес AIM:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Номер GaduGadu"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Номер ICQ:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "Адрес в MSN:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Адрес Yahoo:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Заполните данные о контакте,\n"
 "который хотите добавить в ростер учетной записи %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Заполните данные о контакте, который вы хотите добавить"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Неверный ID пользователя"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "ID пользователя не должен содержать ресурс."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Вы не можете добавлять себя в свой ростер."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Контакт уже в ростере"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Этот контакт уже содержится в вашем ростере."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "ID пользователя:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Jabber-клиент на GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Версия GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Версия PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Разработчики:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Разработчики прошлых версий:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "И наконец, мы хотели бы поблагодарить всех мейнтейнеров пакетов."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Яков Безруков <nebulam51@gmail.com>\n"
@@ -6656,7 +6719,7 @@ msgstr ""
 "Денис Фомин <fominde@mail.ru>\n"
 "Григорий Сарницкий <sargrigory@ya.ru>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6667,88 +6730,98 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
 "s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запрос на подписку для учетной записи %(account)s от %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Войти в комнату с учетной записи %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Неверное имя учетной записи"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Выберите учетную запись, с которой вы хотите войти в комнату"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Неверное имя комнаты"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Это не комната"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не является именем комнаты."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Чтобы объединить контакты, необходимо подключиться к серверу."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Учётная запись не подключена к серверу"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Вы не можете синхронизировать учетную запись если она не подключена."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Синхронизировать"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Начать чат с учетной записью %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Начать чат"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6756,297 +6829,297 @@ msgstr ""
 "Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Соединение недоступно"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Удостоверьтесь, что вы подключены к «%s»."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Неверный JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не понимаю адреса «%s»."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Чтобы изменить пароль, необходимо подключиться к серверу."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Необходимо ввести пароль."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковыми."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Контакт подключился"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Новое сообщение"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Контакт изменит статус"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Новое сообщение с учетной записи %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Новое сообщение для учетной записи %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Сообщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "От %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Консоль XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?"
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr "Добавить"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 msgid "Modify"
 msgstr "Изменить"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 msgid "Groups"
 msgstr "Группы"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Список доступа <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Список доступа для %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Номер: %(order)s,действие: %(action)s, тип: %(type)s, значение: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Номер: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Изменить правило</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавить правило</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки доступа для %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Списки доступа"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Недопустимое имя списка"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Необходимо ввести имя для нового списка доступа."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Вы приглашены в конференцию"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact приглашает вас присоединиться к обсуждению."
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact приглашает вас в комнату %(room_jid)s."
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Вы принимаете приглашение?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Выберите звуковой файл"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "В формате Wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Выбрать картинку"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когда %s происходит:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавление специального уведомления для %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "когда я "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7057,19 +7130,19 @@ msgstr ""
 "\n"
 "Short Authentication String данного сеанса <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Вы уже удостоверили личность этого контакта."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Личность контакта удостоверена"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Удостоверить снова..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7079,19 +7152,19 @@ msgstr ""
 "сообщения или послать сообщения вам, вы должны удостоверить личность "
 "собеседника, нажав кнопку, расположенную ниже."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Личность контакта НЕ удостоверена"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Удостоверить..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Вы удостоверили личность удаленного контакта?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7106,23 +7179,23 @@ msgstr ""
 "\n"
 "Short Authentication String этого сеанса <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Вы переговорили с удаленным контактом и удостоверили SAS?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Ключ (%s) контакта <b>не соответствует</b> ключу, присвоенному в Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
 "сообщения."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7131,7 +7204,7 @@ msgstr ""
 "Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь "
 "вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7226,20 +7299,20 @@ msgstr "Описание"
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Комната «%s» уже есть в ваших закладках."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
 
@@ -7251,15 +7324,15 @@ msgstr "Подписка"
 msgid "Node"
 msgstr "Узел"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Новое сообщение"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Подписаться"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Отписаться"
 
@@ -7704,27 +7777,27 @@ msgstr "Gajim для запуска требуется X-сервер. Выхо�
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim требуется PyGTK 2.12 или выше"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim для запуска требуется PyGTK 2.12 или выше. Выход..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim требуется GTK 2.12 или выше"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim для запуска требуется GTK 2.12 или выше. Выход..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "У GTK отсутствует поддержка libglade."
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7732,20 +7805,20 @@ msgid ""
 msgstr ""
 "Удалите вашу текущую версию GTK и установите последнюю стабильную версию с %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Удостоверьтесь, что GTK+ и PyGTK поддерживают libglade."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim для запуска требуется PySQLite2"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim для запуска требуется pywin32"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7755,11 +7828,11 @@ msgstr ""
 "его на сайте: %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim уже запущен"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7767,20 +7840,20 @@ msgstr ""
 "По-видимому, уже запущен другой экземпляр Gajim\n"
 "Запустить ещё один?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Требуется парольная фраза"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введите пароль для ключа %(keyid)s (аккаунт %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr "Срок действия ключа GPG истёк"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr ""
@@ -7788,15 +7861,15 @@ msgstr ""
 "использования OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Неверная парольная фраза"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Введите парольную фразу для GPG еще раз или нажмите «Отмена»."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7807,58 +7880,58 @@ msgstr ""
 "другим пользователем.\n"
 "Укажите другой ник:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Вы принимаете этот запрос?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Вы принимаете запрос %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Соединение разорвалось"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Ошибка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "ошибка при отправке %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 msgid "Subscription request"
 msgstr "Запрос подписки"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» отозвал подписку с вами"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7866,78 +7939,78 @@ msgstr ""
 "Вы всегда будете видеть его или её как отключенными.\n"
 "Удалить его или её из контакт-листа?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "От подписки отказался"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с «%s» не может быть установлена"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s теперь известен как %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s теперь %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s установил(а) тему: %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Любой участник может увидеть ваш настоящий JID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Теперь в комнате отображается недоступный участник"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "теперь в комнате не отображаются недоступные участники"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Произошло изменение настроек комнаты, не относящееся к настройкам приватности"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Запись логов конференции включена"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Запись логов конференции выключена"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Конференция не анонимна"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Конференция частично анонимна"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Конференция полностью анонимна"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Чтобы войти в комнату %s, нужен пароль."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7945,19 +8018,24 @@ msgstr ""
 "Gajim настроен на использование GPG агента, но GPG агент не запущен или он "
 "возвратил неверный пароль.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без ключа OpenPGP."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Ваша парольная фраза неверна"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Ваша парольная фраза неверна"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr "Ключ GPG не является доверенным"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -7965,13 +8043,14 @@ msgstr ""
 "Ключ GPG используемый для шифрования не является доверенным. Вы "
 "действительно хотите зашифровать эти сообщения?"
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "Не _переспрашивать"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
@@ -7979,12 +8058,12 @@ msgstr ""
 "Gnome Keyring установлен, но некорректно запущен (возможно неверно "
 "установлена переменная среды)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новое письмо на %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7992,7 +8071,7 @@ msgstr[0] "У вас есть %d непрочитанное письмо"
 msgstr[1] "У вас есть %d непрочитанных письма"
 msgstr[2] "У вас есть %d непрочитанных писем"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8007,44 +8086,44 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправить вам файл."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Удаляет контакт из ростера"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Ошибка чтения файла:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получен файл %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8053,36 +8132,36 @@ msgstr ""
 "Не удалось расшифровать сообщение от %s\n"
 "Возможно, оно было испорчено."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Сообщение не удалось расшифровать"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Такое имя уже есть"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Введите новое имя пользователя для локальной учетной записи"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s сек.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Ошибка."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Такое имя уже есть"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8090,11 +8169,11 @@ msgstr ""
 "Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
 "другой ресурс"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Ошибка при проверке SSL сертификата"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8105,15 +8184,15 @@ msgstr ""
 "s\n"
 "Вы всё ещё хотите подключиться к этому серверу?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Игнорировать эту ошибку для данного сертификата."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Ошибка SSL сертификата"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8129,21 +8208,21 @@ msgstr ""
 "Новый отпечаток: %(new)s\n"
 "Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Небезопасное соединение"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, я действительно хочу соединиться небезопасно"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8151,27 +8230,27 @@ msgstr ""
 "Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
 "(Установите PyOpenSSL, чтобы этого не происходило.)"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "PEP узел не был удален"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP узел %(node)s не был удален: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Смайлики выключены"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Тема смайликов не найдена, они будут отключены."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8180,13 +8259,13 @@ msgstr ""
 "Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
 "emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
@@ -8220,12 +8299,13 @@ msgstr ""
 "строке"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "Учетные записи"
 
@@ -8251,9 +8331,9 @@ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "сообщение"
 
@@ -8271,22 +8351,47 @@ msgstr ""
 "«синхронизировать с глобальным статусом»"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Изменяет статус учетной записи или записей"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Приори_тет:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Я хочу _зарегистрировать новую учетную запись"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"изменяет статус учетной записи «учетная запись». Если не указано, пытается "
+"изменить статус всех учетных записей, у которых установлена опция "
+"«синхронизировать с глобальным статусом»"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Показывает окно беседы, чтобы вы могли отправлять сообщения контакту"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакта, с которым вы хотели бы побеседовать"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8296,31 +8401,31 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "содержимое сообщения"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "PGP ключ"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "если указано, сообщение будет зашифровано с использованием открытого ключа"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 "если указано, сообщение будет отправлено с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8330,210 +8435,210 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "тема сообщения"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Отправляет новые сообщения в комнату, к которой вы присоединились."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Получает детальную информацию о контакте"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID контакта"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Получает детальную информацию о учетной записи"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Имя учетной записи"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Отправляет контакту файл"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Путь до файла"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr ""
 "если указано, файл будет отправлен с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Показывает все параметры с их значениями"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Присваивает 'ключу' в 'значение'"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Удаляет параметр"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "имя параметра, который нужно удалить"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Удаляет контакт из ростера"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Добавляет контакт в ростер"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Добавляет новый контакт для данной учетной записи"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущее сообщение о статусе (по умолчанию глобальное, если не "
 "указана учетная запись)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Возвращает количество непрочитанных сообщений"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Открыть диалог «Начать беседу»"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Начать беседу с этой учетной записи"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Отправляет произвольный XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "Отправляемый XML"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr "Учётная запись, из которой будет отправлен XML."
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработать ссылку формата «xmpp:/»"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI для обработки"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Учетная запись, в которой вы хотите его использовать"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "содержимое сообщения"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Присоединиться к комнате MUC"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "комната"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "JID комнаты"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "Ник"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Используемый ник"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "Пароль:"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Пароль для входа в комнату"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Выберите учетную запись, с которой вы хотите войти в комнату"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Проверить, запущен ли Gajim"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Скрывает или показывает окно ipython"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент «JID контакта»"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8542,15 +8647,15 @@ msgstr ""
 "'%s' не в вашем ростере.\n"
 "Укажите учетную запись для отправки сообщения."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "У вас нет ни одной активной учетной записи"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "По-видимому, Gajim не запущен. Вы не можете использовать gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8559,16 +8664,16 @@ msgstr ""
 "Использование: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8577,7 +8682,7 @@ msgstr ""
 "Использование: %s команда [аргумента]\n"
 "Команда одна из:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8586,7 +8691,7 @@ msgstr ""
 "Много аргументов. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8595,7 +8700,7 @@ msgstr ""
 "Аргумент «%(arg)s» не задан. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Неверный хост"
 
@@ -8624,288 +8729,150 @@ msgstr "Вы не можете удалить вашу текущую тему"
 msgid "Please first choose another for your current theme."
 msgstr "Выберите сначала другую тему."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы больше не находитесь в комнате «%(room)s» или «%(nick)s» вышел."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Беседа с "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Возобновлённая беседа"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Запись логов конференции включена"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Новая комната была создана"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер присвоил или изменил ваш ник в комнате"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s выгнал %(nick)s из комнаты: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил(а) %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "ранг изменен"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "настройки комнаты были изменены на 'только для участников'"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "выключение системы"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(actor)s присвоил %(nick)s ранг %(affiliation)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Ранг %(nick)s был изменен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(actor)s присвоил %(nick)s обязанности %(role)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Обязанности %(nick)s были изменены на %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Ник не обнаружен: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "У этой комнаты нет темы"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Пригласил(а) %(contact_jid)s в %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Ник не обнаружен: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Использование: /%s <ник|JID> [причина], запрещает JID заходить в комнату. "
-"Ник посетителя можно подставить, если он не содержит «@». Если JID в данный "
-"момент находится в комнате, то он/она/оно также будет выгнан. НЕ "
-"поддерживает пробелы в никах."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Использование: /%s <ник>, открывает окно привата с указанным посетителем."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Использование: /%s [причина], закрывает текущее окно или вкладку, приводя "
-"причину, если она указана."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
-"возможным указанием причины."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Использование: /%s <комната>@<сервер>[/ник], предлагает подключиться к "
-"комната@сервер, с возможным указанием ника."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из "
-"комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Использование: /%s <ник> [сообщение], открывает окно личной беседы и "
-"отсылает сообщение посетителю с указанным ником."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Использование: /%s, показывает список присутствующих в комнате."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Использование: /%s <сообщение>, отсылает сообщение без поиска других команд "
-"в нем."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr "Использование: /%s <ник>, запретить <ник> отправлять вам сообщения."
-
-#: ../src/groupchat_control.py:1784
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Использование: /%s <ник>, разрешить <ник> отправлять вам сообщения."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы точно хотите выйти из комнаты «%s»?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Смена темы"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Введите новую тему:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Смена ника"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Введите новый ник, который вы хотите использовать:"
 
 # смотря где вылазит меседж - нужно присмотреться
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Удаление %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8913,22 +8880,22 @@ msgstr ""
 "Вы собираетесь полностью уничтожить эту комнату.\n"
 "Можете указать причину:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Можете указать альтернативную комнату:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Выгоняем %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
@@ -9003,6 +8970,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Сохранить изображение как..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "В _новую комнату"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Не могу найти базу данных истории"
@@ -9086,50 +9061,60 @@ msgstr "История %s"
 msgid "Disk Error"
 msgstr "Ошибка записи на диск"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s теперь %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Сообщение об ошибке: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Ошибка."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус установлен в: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Не могу загрузить изображение"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Изображение слишком большое"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Вы собираетесь закрыть несколько вкладок"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Действительно закрыть их всех?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Чаты"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Комнаты"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Личные беседы"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Сообщения"
 
@@ -9189,18 +9174,18 @@ msgstr "Игнорировать"
 msgid "Retrieving profile..."
 msgstr "Получаю данные..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Пустой файл"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Файл не существует"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
@@ -9231,46 +9216,46 @@ msgid ""
 msgstr ""
 "При публикации вашей личной информации произошла ошибка, попробуйте позже."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь «%s» будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG использовать невозможно"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9278,27 +9263,27 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать невидимым?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "не синхронизировано"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr "Закрыть Gajim?"
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы точно хотите закрыть Gajim?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr "Всегда закрывать Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9306,16 +9291,16 @@ msgstr ""
 "Сообщения будут доступны для чтения позже, если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт «%s» будет удален"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9323,11 +9308,11 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9336,58 +9321,69 @@ msgstr ""
 "У вас больше не будет возможности приема и отправки сообщений через эти "
 "транспорты:%s."
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Вы точно хотите создать метаконтакт?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Назначить ключ OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ, который будет применен к контакту"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» будет удален из вашего ростера"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Вы собираетесь удалить «%(name)s» (%(jid)s) из вашего списка контактов.\n"
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9396,11 +9392,11 @@ msgstr ""
 "не сможет видеть ваш статус."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Продолжить?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9408,16 +9404,16 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Контакты будут удалены из вашего ростера"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9427,20 +9423,33 @@ msgstr ""
 "Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
 "оффлайне."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Вы точно хотите создать метаконтакт?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9448,12 +9457,12 @@ msgstr ""
 "Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
 "следующем подключении."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы точно хотите создать метаконтакт?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9463,11 +9472,11 @@ msgstr ""
 "Обычно используется, когда один и тот же человек имеет несколько учетных "
 "записей в Jabber или на транспортах."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Неверный файл:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9475,12 +9484,12 @@ msgstr[0] "Хотите отправить файл %s:"
 msgstr[1] "Хотите отправить файлы %s:"
 msgstr[2] "Хотите отправить файлы %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, python-format
 msgid "Send %s to %s"
 msgstr "Отправить %s контакту %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Обьединить %s и %s в метаконтакт"
@@ -9490,115 +9499,127 @@ msgstr "Обьединить %s и %s в метаконтакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "для учетной записи %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "учетной записи %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Управление _закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Музыка"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Настроить Сервисы..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Развернуть все"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Управление контактами"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Редактировать _группы"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Отправить одиночное сообщение"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Выполнить команду..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Управление транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Изменить транспорт"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "П_ереименовать"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "Развернут_ь"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Выйти"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "В _новую комнату"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Выйти"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Войти в новую комнату"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Изменить сообщение о статусе..."
 
@@ -9615,20 +9636,20 @@ msgstr "Ошибка в принятой форме данных"
 msgid "No result"
 msgstr "Нет результата"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Ошибка записи на диск"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Подтвердить данные настройки сеанса"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9643,7 +9664,7 @@ msgstr ""
 "\n"
 "\tПриемлемы ли эти настройки?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9835,6 +9856,138 @@ msgstr "Нет ожидающего запроса на подписку."
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Добавить специальное _уведомление"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Назначить ключ  Open_PGP"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Команда не поддерживается учетной записью zeroconf."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Команды: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Использование: /%s, очищает текстовое окно."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Использование: /%s, скрывает кнопки беседы."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Использование: /%(command)s <действие>, совершает действие в текущей "
+#~ "комнате. Используйте третье лицо (например, «/%(command)s взрывается».)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Использование: /%s, посылает пинг контакту"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Использование: /%s, посылает сообщение контакту"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Нет подсказки для /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr ""
+#~ "Приём и отправка локальных (link-local) сообщений и сообщений в сетях "
+#~ "zeroconf"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Ник не обнаружен: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "У этой комнаты нет темы"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Пригласил(а) %(contact_jid)s в %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Ник не обнаружен: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Использование: /%s <ник|JID> [причина], запрещает JID заходить в комнату. "
+#~ "Ник посетителя можно подставить, если он не содержит «@». Если JID в "
+#~ "данный момент находится в комнате, то он/она/оно также будет выгнан. НЕ "
+#~ "поддерживает пробелы в никах."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Использование: /%s [причина], закрывает текущее окно или вкладку, приводя "
+#~ "причину, если она указана."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
+#~ "возможным указанием причины."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Использование: /%s <комната>@<сервер>[/ник], предлагает подключиться к "
+#~ "комната@сервер, с возможным указанием ника."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником "
+#~ "из комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Использование: /%s <ник> [сообщение], открывает окно личной беседы и "
+#~ "отсылает сообщение посетителю с указанным ником."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Использование: /%s, показывает список присутствующих в комнате."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Использование: /%s <сообщение>, отсылает сообщение без поиска других "
+#~ "команд в нем."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
+#~ "messages."
+#~ msgstr "Использование: /%s <ник>, запретить <ник> отправлять вам сообщения."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "Использование: /%s <ник>, разрешить <ник> отправлять вам сообщения."
+
 #~ msgid "B_OSH Port:"
 #~ msgstr "Порт B_OSH:"
 
diff --git a/po/sk.po b/po/sk.po
index 24cf046af..81bcb2d1c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-20 00:04+0200\n"
 "Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -213,6 +213,7 @@ msgstr "<b>Osobné informácie</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Účet"
 
@@ -278,8 +279,8 @@ msgstr "Upraviť osobné informácie..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -290,8 +291,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Všeobecné"
 
@@ -350,25 +351,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informácie o vás sú uložené na serveri"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Žiadny kľúč nie je vybraný"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Žiadny"
 
@@ -527,8 +524,8 @@ msgstr ""
 "Zoberte v úvahu aj prípadné nastavenie firewallu."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -542,7 +539,7 @@ msgid "Mer_ge accounts"
 msgstr "Z_lúčiť účty"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Preme_novať"
 
@@ -801,7 +798,7 @@ msgid "All statuses"
 msgstr "Všetky stavy"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Preč"
 
@@ -818,7 +815,7 @@ msgid "Have "
 msgstr "Má"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Neviditeľný"
 
@@ -827,7 +824,7 @@ msgid "Launch a command"
 msgstr "Vykonať príkaz"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Neprítomný"
 
@@ -1012,7 +1009,7 @@ msgid "Join _Group Chat"
 msgstr "_Pripojiť sa k diskusnej skupine"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Pridať do zoznamu..."
 
@@ -1038,39 +1035,6 @@ msgstr "_Otvoriť odkaz v prehliadači"
 msgid "_Start Chat"
 msgstr "_Začať rozhovor"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Pozvať _kontakty"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Poslať _súbor"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Prepnúť na End to End šifrovanie"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Zapnúť Open_PGP šifrovanie"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Pridať do zoznamu"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_História"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "Poz_vať"
@@ -1093,6 +1057,119 @@ msgid ""
 "Select the contacts you want to invite"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "P_ožiadať jeho/ju o súhlas k zobrazeniu stavu"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Pridať špeciálne _upozornenie..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Prideliť Open_PGP kľúč..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Vykonať príkaz..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Upraviť _skupiny..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "Poz_vať do"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Pozvať _kontakty"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "O_dstrániť"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Poslať vlas_tný stav"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Poslať krátku _správu..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Poslať _súbor..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Nastaviť vlastný _avatar..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Začať _rozhovor"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Prepnúť na End to End šifrovanie"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Zapnúť Open_PGP šifrovanie"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Povoliť jemu/jej vidieť môj stav"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Blokovať"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Odmietnuť jemu/jej zobrazenie stavu"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_História"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignorovať"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "S_pravovať kontakt"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Premenovať..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Požiadavky"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Odblokovať"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Neignorovať"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Vyplňte formulár."
@@ -1209,7 +1286,7 @@ msgstr ""
 "Riadok s kontaktom\n"
 "Titulok diskusie"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Tučné"
 
@@ -1233,7 +1310,7 @@ msgstr "Minulé"
 msgid "Inactive"
 msgstr "Neaktívny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Kurzíva"
 
@@ -1305,6 +1382,14 @@ msgstr "Mo_derátor"
 msgid "Occupant Actions"
 msgstr ""
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Poslať _súbor"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Pridať do zoznamu"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1313,13 +1398,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Zakázať"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Blokovať"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Vykopnúť"
@@ -1336,13 +1414,6 @@ msgstr "_Vlastník"
 msgid "_Send Private Message"
 msgstr "_Poslať súkromnú správu"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Odblokovať"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Hlas"
@@ -1351,7 +1422,7 @@ msgstr "_Hlas"
 msgid "Create new post"
 msgstr "Vytvoriť novú správu"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Od"
 
@@ -1376,8 +1447,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Vitajte v Gajim správca histórie</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -1430,34 +1501,39 @@ msgstr "Hľadať:"
 msgid "_Log conversation history"
 msgstr "Zaznamenávať históriu k_onverzácie"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Zazáložkovať túto miestosť (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Pripojiť sa k diskusnej skupine"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Prihlásiť sa do miestnosti automaticky, keď sa pripojím"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Prezývka:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Posledné:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Miestnosť:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Pripojiť"
@@ -1486,7 +1562,7 @@ msgstr "Minimalizovať pri automatickom pripojení"
 msgid "Print status:"
 msgstr "Vypísať stav:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2024,7 +2100,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Usporiadať kontakty podľa stavu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Stav"
 
@@ -2191,34 +2267,39 @@ msgid "All"
 msgstr "Všetko"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "všetko podľa podpisu"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Povoliť"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Zakázať"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Poradie:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Súkromný zoznam"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "všetko podľa podpisu"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "všetko v skupine"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2230,19 +2311,19 @@ msgstr ""
 "od\n"
 "k"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "poslať mi správu"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "poslať mi požiadavky"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "poslať mi stav"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "vidieť môj stav"
 
@@ -2410,96 +2491,11 @@ msgstr "Odstrániť účet z Gajim aj zo _serveru"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "O_dstrániť"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "P_ožiadať jeho/ju o súhlas k zobrazeniu stavu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Pridať špeciálne _upozornenie..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Prideliť Open_PGP kľúč..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Upraviť _skupiny..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Vykonať príkaz..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "Poz_vať do"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "O_dstrániť"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Poslať vlas_tný stav"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Poslať krátku _správu..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Poslať _súbor..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Nastaviť vlastný _avatar..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Začať _rozhovor"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Povoliť jemu/jej vidieť môj stav"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Odmietnuť jemu/jej zobrazenie stavu"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignorovať"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "S_pravovať kontakt"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Premenovať..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Požiadavky"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Neignorovať"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2621,7 +2617,7 @@ msgid "_Add contact"
 msgstr "_Pridať kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Informácie"
 
@@ -2834,26 +2830,6 @@ msgstr "_Správa"
 msgid "_Presence"
 msgstr "_Prítomnosť"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Pridať špeciálne _upozornenie"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Prideliť Open_PGP kľúč"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Upraviť _skupiny"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Premenovať"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Upraviť účet"
@@ -2897,48 +2873,48 @@ msgid "Service returned an error."
 msgstr "Služba vrátila chybu"
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Aktivovaná"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Deaktivovaná"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Logický"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Celočíselný"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Farba"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Názov vlastnosti"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Žiadny)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Skryté"
 
@@ -2952,187 +2928,186 @@ msgstr "Dostali ste novú položku:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Angličtina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Bieloruština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulharčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretónčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Nemčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Gréčtina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Britština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Španielčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Baskičtina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Francúzština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Chorvátčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Taliančina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Nórčina (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Holandština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Nórčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Poľština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugalčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brazílska portugalčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Srbština"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Švédčina"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Čínština (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Jazyk používaný pri kontrole pravopisu"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Vašu správu nie je možné odoslať, pokiaľ nebudete pripojený."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Neurčitý"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Chorý"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktné informácie"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Skutočne poslať súbor?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Ak pošlete súbor %s, on/ona budú poznať vaše skutočné Jabber ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "Povolené GPG šifrovanie"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Nie je v zozname"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Zoznam aktívnych, dokončených a zastavených prenosov súborov"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Neznámy umelec"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Neznámy titulok"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Neznámy zdroj"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3141,171 +3116,128 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskusnej skupiny %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr "=="
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "Zakázané GPG šifrovanie"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Relácia BUDE zaznamenaná"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Relácia NEBUDE zaznamenaná"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "NIE je"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "NEbude"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "a overený"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "a NEoverený"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Príkazy: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Použitie: /%s, vyčistí textové okno."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Použitie: /%s, skryje tlačidlá rozhovoru."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Použitie: /%(command)s <akcia>, odošle akciu pre aktuálnu diskusnú skupinu. "
-"Použite tretiu osobu. (napr. /%(command)s explodoval.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Použitie: /%s, pošle ping kontaktu"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Použitie: /%s, pošle správu kontaktu"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Žiadne informácie s pomocou pre /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Táto relácia je šifrovaná"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " a BUDE zaznamenaná"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " a NEBUDE zaznamenaná"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E šifrovanie zakázané"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Nasledujúca správa NEbola šifrovaná"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Nasledujúca správa bola šifrovaná"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Práve ste prijali novú správu od \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Ak zatvoríte túto kartu a máte deaktivovanú históriu, správa bude stratená."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Chyba databázy"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3314,7 +3246,7 @@ msgstr ""
 "Súbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť alebo ho "
 "odstrániť (všetko v histórii bude stratené)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je teraz %(status)s"
@@ -3323,23 +3255,23 @@ msgstr "%(name)s je teraz %(status)s"
 msgid "creating logs database"
 msgstr "vytváranie záznamov databáz"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je súbor ale mal byť priečinok"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim bude ukončený"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je priečinok ale mal byť súbor"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "vytváram priečinok %s"
@@ -3403,9 +3335,9 @@ msgstr "Zvolte diskusné skupiny, ktoré chcete opustiť"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Diskuné skupiny"
 
@@ -3421,68 +3353,109 @@ msgstr "Preposlať neprečítané správy"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Použiť D-Bus a Notification-Daemon pre zobrazenie upozornení"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minútach, po ktorých sa zmení stav na preč."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Preč ako výsledok nečinnosti viac ako $T minút)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minútach, po ktorých sa zmení stav na neprítomný."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Neprítomný ako výsledok nečinnosti viac ako $T minút)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Neplatná prezývka"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "text správy o stave"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Neplatná prezývka"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Zmena prezývky"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "text správy o stave"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Zoznam (oddelený medzerami) a riadkov (účet a skupina), ktoré sú zabalené."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "predvolená"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Povoliť link-local/zeroconf správy"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Jazyk pre kontrolu pravopisu"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3492,25 +3465,25 @@ msgstr ""
 "'sometimes' - zobraziť každých print_ichat_every_foo_minutes minút.\n"
 "'never' - nezobrazovať čas."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Použiť * / _ pár znakov ako možné formátovacie znaky."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ak je pravda, neodstaňuj */_ .  Takže *abc* bude tečné a * * nebude "
 "odstránené."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3521,7 +3494,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Ak to chcete používať, "
 "nainštalujte docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3529,7 +3502,7 @@ msgstr ""
 "Znak použitý za prezývkou, keď sa používa automatické dopĺňanie (tab) v "
 "diskusnej skupine."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3537,26 +3510,26 @@ msgstr ""
 "Vaša prezývka sa zhoduje s inou prezývkou v diskusnej miestnosti aj po "
 "pripojení znaku."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaky zobrazené za prezývkou v konverzáciách"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaky zobrazené pred prezývkou v konverzáciách"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Pridať * a [n] do titulku zoznamu?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3564,11 +3537,25 @@ msgstr ""
 "Koľko riadkov si pamätať z predchádzajúceho rozhovoru, keď bude karta/okno "
 "znovu otvorená."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Z koľkých minút majú byť riadky s predchádzajúcej konverzácie."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3576,11 +3563,11 @@ msgstr ""
 "Poslať správu pri stlačení Ctrl+Enter a pri Enter spraviť nový riadok "
 "(chovanie podobné ako Mirabilis ICQ klient)"
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koľko riadkov posunúť pri stlačení Ctrl+KP_hore."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3589,12 +3576,12 @@ msgstr ""
 "Ani url s %s kde je %s slovo/fráza alebo 'WIKTIONARY' čo znamená použitie "
 "wiktionary."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ak je zaškrtnuté, Gajim môže byť ovládaný na diaľku s použitím gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3605,20 +3592,20 @@ msgstr ""
 "účtov (nie je nutné, aby listen_to_network_manager bolo nastavené na False) "
 "podľa stavu sieťového pripojenia."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3626,11 +3613,11 @@ msgstr ""
 "Pokiaľ sa čas pri každej správe (print_time==sometimes), vypíše sa každých x "
 "minút."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spýtať sa pred zatvorením okna/záložky pre diskusnú skupinu."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3638,7 +3625,7 @@ msgstr ""
 "Vždy sa spýtať pred zatvorením okna/záložky diskusnej skupiny, ktorej meno "
 "je uvedené v zozname diskusných JID."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3646,39 +3633,39 @@ msgstr ""
 "Nikdy sa nepýtať pred zatvorením karty/okna pre diskusnú skupinu, ktorej "
 "meno je uvedené v zozname JID."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 msgstr ""
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC štandard znamená KiB = 1024 bajtov, KB = 1000 bajtov."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Upozorňovať na udalosti v oblasti systémových upozornení."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Ukázať kartu len ak prebieha konverzácia?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Zobraziť zatváracie tlačidlo v karte?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3686,16 +3673,16 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Predbežné zobrazenie nových správ vo vyskakovacom upozornení."
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "Bodkočiarkou oddelený zoznam slov bude zvýraznený v diskusnej skupine."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3703,14 +3690,14 @@ msgstr ""
 "Ak je pravda, Gajim skončí keď bude X tlačidlo vo Window manažéri stlačené. "
 "Toto nastavenie je použíté, len v prípade, že sa používa trayikona."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ak je pravda, Gajim bude kontrolovať pri každom štarte, či je štandartný "
 "klient."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3718,7 +3705,7 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí ikonku na každej záložke obsahujúcej neprečítané "
 "správy. Závisí na téme, ikonka môže byť animovaná."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3726,11 +3713,11 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí stavovú správu v zozname kontaktov, za "
 "predpokladu, že táto správa nie je prázdna."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3738,7 +3725,7 @@ msgstr ""
 "Ak je pravda, Gajim si vyžiada avatara, pre každý kontakt, ktorý nemá "
 "avatara z posledného spojenia, alebo ak nie je cache príliš zastaralá."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3746,7 +3733,7 @@ msgstr ""
 "Ak nie je pravda, nebudete vidieť informáciu o zmene stavu kontaktu a jeho/"
 "jej stavovú správu"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3755,28 +3742,28 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Farba pozadia použitá pri prihlásení kontaktu."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Farba pozadia použitá pri odhlásení kontaktu."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "Ak je pravda, obnovené správy budú zobrazené menším písmom."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazovať avatarov pre transport."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Nezobrazovať zoznam v paneli úloh."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3786,7 +3773,7 @@ msgstr ""
 "2.8, potom bude okno blikať (bežné správanie pre väčšinu okenných "
 "manažérov), keď sa udeje nejaká udalosť."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3797,7 +3784,7 @@ msgstr ""
 "informácie o prítomnosti v diskusnej skupine."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3817,31 +3804,31 @@ msgstr ""
 "'pertype' - Každý typ správy (napr., rozhovory proti diskusiám) sú odoslané "
 "do špecifikovaného okna."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ak nie je pravda, neuvidíte avatarov v diskusnom okne"
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ak je pravda, stlačením Esc klávesy zatvoríte kartu/okno."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Skývať tlačidlá v okne rozhovoru."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Skrývanie titulku v okne s diskusnou skupinou"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryť titulok v okne s diskusiou dvoch osôb."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skrývanie zoznamu účastníkov v okne s diskusnou skupinou."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3849,15 +3836,15 @@ msgstr ""
 "V rozhovore sa zobrazí prezývka na začiatku riadku, len v prípade, že "
 "predchádzajúca správa prišla od inej osoby."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr ""
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3865,13 +3852,13 @@ msgid ""
 msgstr ""
 "Zoznam farieb, ktoré budú použité na zafarbenie prezývok v diskusnej skupine."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab vás presunie na ďalšiu kartu, pokiaľ už nie sú žiadne neprečítané "
 "správy."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3879,14 +3866,32 @@ msgstr ""
 "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
 "znamená, že dialóg sa nezobrazuje."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
+"znamená, že dialóg sa nezobrazuje."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
+"znamená, že dialóg sa nezobrazuje."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3894,7 +3899,7 @@ msgstr ""
 "Ak je pravda, Gajim bude používať Správca zväzku kľúčov (ak je prítomný) na "
 "ukladanie hesiel."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3903,7 +3908,7 @@ msgstr ""
 "Ak je pravda, Gajim bude používať Správca zväzku kľúčov (ak je prítomný) na "
 "ukladanie hesiel."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3911,13 +3916,13 @@ msgstr ""
 "Ak je pravda, Gajim bude zobrazovať počet prítomných a všetkých kontaktov v "
 "riadku účtu a skupiny."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3925,17 +3930,17 @@ msgstr ""
 "Ak je pravda, Gajim naroluje a označí kontakt, ktorý poslal poslednú správu, "
 "ak nie je práve otvorené okno rozhovoru."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Doba neaktivity potrebná na zmenenie stavu na zatvoril okno."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3943,35 +3948,45 @@ msgstr ""
 "Maximálny počet riadkov zobrazených v rozhovore. Najstaršie riadky budú "
 "zmazané."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -3979,68 +3994,79 @@ msgstr ""
 "Priorita sa zmení automaticky vzhľadom k vášmu stavu. Priority sú definované "
 "v premenných autopriority_* nastaveniach."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Ak je povolené, obnoví sa naposledy použitý stav."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Ak nie je pravda, neuvidíte avatarov v diskusnom okne"
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Povoliť šifrovanie ESessions pre tento účet."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Má Gajim automaticky spúšťať šifrovanú reláciu keď je to možné?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr "Zobraziť upozornenie pred poslaním hesla cez plaintext spojenie."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Zobraziť upozornenie pred použitím štandardnej SSL knižnice."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4048,25 +4074,25 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim použije vašu IP adresu a proxy definovanú v "
 "premennej file_transfer_proxies na prenos súborov."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Má tento kontakt k dispozícii OpenPGP?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4074,199 +4100,199 @@ msgstr ""
 "Mal by sa Gajim spúšťať automaticky so šifrovanou reláciou pre tento kontakt "
 "keď je to možné?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk v ktorom má byť prevádzaná kontrola pravopisu"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "všetky alebo medzerou oddelené stavy"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'áno', 'nie', alebo 'oboje'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'áno', 'nie' alebo ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Práve jem, prosím nechajte mi odkaz."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Pracujem"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefonujem"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Telefonujem."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Vonku"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Som vonku a užívam si život."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Prítomný."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Mám čas na rozhovor."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Nie som prítomný."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Nerušiť."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Ahoj!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Prehrať zvuk keď príde nejaká MUC správa."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "človek"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "námornícka"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Nie je možné nahrať idle modul"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Nesprávny hostiteľ"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Neplatná miestna adresa? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Redistračné informácie pre službu %s nedorazili včas"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Registrovať na %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Spojenie zlyhalo"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Neviditeľnosť nie je podporovaná"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditeľnosť."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Nesprávné Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, fuzzy, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4275,77 +4301,84 @@ msgstr ""
 "Súbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť alebo ho "
 "odstrániť (všetko v histórii bude stratené)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Prezývka nie je povolená: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Diskusná skupina %s neexistuje."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Vytváranie diskusných skupín je obmedzené."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vaša zaregistrovaná prezývka musí byť použitá v diskusnej skupine %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nie ste v zozname členov v skupinovej diskusii %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Miestnosť bola zničená"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Chcem si vás pridať do môjho zoznamu."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sme prihlásení k %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "požiadavka na odhlásenie od %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sme odhlásení od %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4355,221 +4388,207 @@ msgstr ""
 "nástroje na správu zoznamu, napríklad: http://jru.jabberstudio.org/ pre jeho "
 "odstránenie"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "OpenPGP passfráza nebola zadaná"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Budete pripojený k %s bez OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Nepodarilo sa získať certifikát CRL"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodarilo sa dešifrovať podpis certifikátu"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodarilo sa dešifrovať CRL podpis"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Podpísanie certifikátu zlyhalo"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Certifikát vypršal"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL vypršal"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Nepodarilo sa overiť prvý certifikát"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Reťazec certifikátu je príliš dlhý"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Certifikát nie je dôverný"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Certifikát odmietnutý"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Znovu pripojiť manuálne."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s odpovedal zle na požiadavku o registráciu: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytol rozdielny registračný formulár"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznáma chyba SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Nesprávna odpoveď"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s odpovedal nesprávne pri odoslaní registračnej požiadavky: "
 "%(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Uložené do: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Pripojenie k proxy zlyhalo"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie je možné pripojiť sa k účtu %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Spojenie s účtom \"%s\" bolo stratené. Zopakuje sa pripájanie."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4578,7 +4597,7 @@ msgstr ""
 "\n"
 "Chyba SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4587,24 +4606,24 @@ msgstr ""
 "\n"
 "Neznáma chyba SSL: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Overenie zlyhalo s \"%s\""
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Chyba počas odstraňovania súkromného zoznamu"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4613,30 +4632,30 @@ msgstr ""
 "Súkromný zoznam %s nebol odstránený. Možno je používaný jedným z vašich "
 "pripojených zdrojov. Deaktivujte ho a skúste to znovu."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Táto správa je *šifrovaná* (Pozrite :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4645,30 +4664,40 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Pozvať _kontakty"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Nie je možné získať, pretože aktuálny stav je: Neviditeľný"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Spojenie zlyhalo"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Pozorovatelia"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transporty"
 
@@ -4677,14 +4706,19 @@ msgid "Not in roster"
 msgstr "Nie je v zozname"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python väzby chýbajú na tomto počítači"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus vlastnosti programu Gajim nemôžu byť použité"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "chýbajúca závislosť na pysqlite2 (aka python-pysqlite2). Ukončenie..."
@@ -4760,56 +4794,69 @@ msgid "eleven"
 msgstr "jedenásť"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s hodín"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "päť po %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "desať po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "štvrť po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "dvadsať po %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "dvadsaťpäť po %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "pol %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "dvadsaťpäť do %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "dvadsať do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "štvrť do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "desať do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "päť do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s hodina"
 
@@ -4877,190 +4924,190 @@ msgstr "Nepovolený znak v názve hostiteľa."
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Prítomný"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Prítomný"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "P_reč"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Odhlásený"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Odhlásený"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Žiadny"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Pre"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Oba"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Žiadny"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "píše správu..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5068,22 +5115,22 @@ msgstr[0] "%d správ čaká"
 msgstr[1] "%d správa čaká"
 msgstr[2] "%d správy čakajú"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " z miestnosti %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " od používateľa %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5091,12 +5138,12 @@ msgstr[0] "%d udalostí čaká"
 msgstr[1] "%d udalosť čaká"
 msgstr[2] "%d udalosti čakajú"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, fuzzy, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
@@ -5112,11 +5159,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "azúrová"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -5773,7 +5820,7 @@ msgstr ""
 "Možno máte spustenú inú inštanciu programu Gajim. Prenos súboru bude zrušený."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5781,23 +5828,35 @@ msgstr ""
 "[Toto je časť šifrovanej relácie. Ak vidíte túto správu, potom je niečo "
 "nesprávne.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP passfráza nebola zadaná"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Budete pripojený k %s bez OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pre pokračovanie odosielania a prijímania správ, sa musíte znovu pripojiť."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5806,31 +5865,31 @@ msgstr ""
 "%s\n"
 "Link-local správy nemusia správne fungovať."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Prosím skontrolujte, či je nainštalovaný program Avahi alebo Bonjour."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Nie je možné spustiť lokálnu službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie je možné použiť port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Prosím skontrolujte, či je spustený program avahi-daemon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie je možné zmeniť stav účtu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5839,20 +5898,20 @@ msgstr ""
 "odoslať."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Táto správa je šifrovaná]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Vašu správu nie je možné odoslať."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je odhlásený. Vašu správu nie je možné odoslať."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5865,24 +5924,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Chyba pri pridávaní služby. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Predvolená správa"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Povolené"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pre jazyk %s nie je k dispozícii"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5892,212 +5951,218 @@ msgstr ""
 "pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
 "nastavením premennej setting the speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "text správy o stave"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Prihlásiť znovu?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ak chcete, aby boli všetky zmeny naraz aplikované, musíte sa znovu prihlásiť."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Neprečítané udalosti"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Prečítať všetky správy pred odstránením tohoto účtu."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Máte otvorený rozhovor pod účtom %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
 "pokračovať?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený na server"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "Pre zmenu názvu účtu, musíte mať prečítané všetky čakajúce správy."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Názov účtu je už použitý"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tento názov je už použitý jedným z vašich účtov. Prosím, zvoľte si iný názov."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Nesprávny názov účtu"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Názov účtu nemôže byť prázdny."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Premenovať účet"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadať nový názov pre účet %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí byť v tvare \"používateľ@menoserveru\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Vlastný port musí byť číslo portu."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Vznikol problém pri získavaní vášho OpenPGP tajného kľúča."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť meniť vaše osobné "
 "informácie."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený k serveru"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Server nepodporuje Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumožňuje uloženie vašich osobných informácií."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Prosím, premenujte alebo odstráňte to pred zapnutím link-local správ."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Čierna listina"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Dôvod"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Zakazujem..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6105,11 +6170,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6117,11 +6182,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6129,17 +6194,17 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6156,58 +6221,58 @@ msgstr ""
 "4. doména (doména sama o sebe, ľubovoľný používateľ@doména,\n"
 "doména/zdroj, alebo adresa obsahujúca subdoménu."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?zobrazovaný stav:All"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Len vstúpiť a vystúpiť"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?zobrazovaný stav:None"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Nová diskusná skupina"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6215,65 +6280,64 @@ msgstr ""
 "odstráňte túto záložku."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Prezývka nie je povolená: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Môžete nastaviť pokročilé vlastnosti účtu stlačením tlačidla Pokročilé, "
 "alebo neskôr zvolením položky Účty v menu Upraviť v hlavnom okne."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol úspešne vytvorený"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Musíte vložiť meno používateľa pre konfuguráciu tohoto účtu."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Poskytnite, prosím, server na ktorom sa chcete zaregistrovať."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Certifikát už v súbore"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Tento certifikát je práve v súbore %s, preto nebude znova pridaný."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6288,7 +6352,7 @@ msgstr ""
 "SSL chyba: %(error)s\n"
 "Chcete sa ešte pripojiť k tomuto serveru?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6299,70 +6363,70 @@ msgstr ""
 "SHA1 fingerprint certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Vyskytla sa chyba počas tvorby účtu"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Názov účtu je už používaný"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Ďalšia prijatá správa zameraná"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Ďalšia prijatá správa nezameraná"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakt pripojený"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Správa odoslaná"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Prijatý GMail e-mail"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6370,74 +6434,74 @@ msgstr ""
 "Zatiaľ čo ste nevenovali pozornosť tejto diskusnej skupine, pribudol "
 "nasledujúci text, ktorý je pod čiarou"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Koniec"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcie pre \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Vyhľadať to v _slovníku"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chýba \"%s\" a to nie je WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pre web vyhľadávanie chýba \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Otvoriť ako _odkaz"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "Pred %i dňami"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Jabber Id je už v zozname"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "nové@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nové%d@jabber.id"
@@ -6472,124 +6536,124 @@ msgstr "Meno kontaktu"
 msgid "Set Mood"
 msgstr "Nastaviť náladu"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s správa o stave"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Správa o stave"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Prepísať správu o stave?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Tento názov je už použitý. Chcete prepísať túto správu o stave?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Uložiť ako prednastavenú správu o stave"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Zadajte prosím názov pre túto stavovú správu"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG číslo:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ číslo:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať do účtu %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Nespravné ID používateľa"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "ID používateľa nesmie obsahovať zdroj."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Nemôžete pridať seba do vášho zoznamu kontaktov."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakt je už v zozname"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Používateľské ID:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klient"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Verzia GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Verzia PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Súčasní vývojári:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Bývalí vývojári:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "POĎAKOVANIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "V neposlednom rade ďakujeme všetkým správcom balíkov."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Juraj Michálek (juraj.michalek AT asinus.org)\n"
 "Peter Trško (dogmat AT dogmat.us)\n"
 "Pavol Klačanský <pavol@klacansky.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6598,88 +6662,98 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Prezývka obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Požiadavka na zápis pre účet %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už ste v diskusnej skupine %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť sa k diskusnej skupine s účtom %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Nesprávny názov účtu"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Nesprávne Jabber ID diskusnej skupiny"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Toto nie je diskusná skupina"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie je názov diskusnej skupiny."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Tento účet nie je pripojený k serveru"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemôžete sa synchronizovať s kontaktom ak nie je prihlásený."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Synchronizovať"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6688,300 +6762,300 @@ msgstr ""
 "odoslať správu:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený k \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Nesprávne JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie je možné spracovať \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí sa musia zhodovať."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt sa prihlasil"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nová správa"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nová krátka správa"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Nová súkromná správa"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nový e-mail"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt zmenil stav"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Krátka správa s použitím účtu %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Krátka správa v účte %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Krátku správu"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Prijatý %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Od %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML konzola"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Chcem si vás pridať do môjho zoznamu kontaktov."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr ""
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Náladový"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Skupina"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Chcem si vás pridať do môjho zoznamu."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Súkromný zoznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Súkromný zoznam pre %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Poradie: %(order)s, akcia: %(action)s, typ: %(type)s, hodnota: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Poradie: %(order)s, akcia: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upraviť pravidlo</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Pridať pravidlo</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Súkromné zoznamy pre %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Súkromné zoznamy"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Nesprávny názov zoznamu"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte vložiť názov, aby bolo možné vytvoriť nový súkromný zoznam."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Ste pozvaný do diskusnej skupiny"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete prijať pozvanie?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav zvuky"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Vybrať obrázok"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Keď %s sa stane:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Pridáva sa špeciálne upozornenie pre %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Podmienka"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "keď som "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6989,38 +7063,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu overená"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Overiť znovu..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NEoverená"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Overiť..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Overili ste identitu kontaktu?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7030,27 +7104,27 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, fuzzy, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 #, fuzzy
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr "=="
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 #, fuzzy
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
@@ -7144,20 +7218,20 @@ msgstr "Popis"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavená"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Diskusná skupina \"%s\" je už vo vašich záložkách."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Záložka bola úspešne pridaná"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Môžete spravovať záložky cez Akcie v menu vo vašom zozname."
 
@@ -7169,15 +7243,15 @@ msgstr "Prihlásiť"
 msgid "Node"
 msgstr ""
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Nová správa"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť"
 
@@ -7635,31 +7709,31 @@ msgstr "Gajim potrebuje X server k behu. Ukončujem..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim potrebuje PyGTK 2.8 alebo vyššie"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim potrebuje PyGTK 2.8 alebo vyššie k behu. Ukončujem..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim potrebuje GTK 2.8 alebo vyššie"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim potrebuje GTK 2.8 alebo vyššie k behu. Ukončujem..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ prostredie nepodporuje libglade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7668,22 +7742,22 @@ msgstr ""
 "Prosím, odstráňte vašu aktuálnu verziu GTK+ prostredia a nainštalujte si "
 "poslednú stabilnú verziu z %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Prosím, uistite sa, že GTK+ a PyGTK majú podporu pre libglade vo vašom "
 "systéme."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim potrebuje PySQLite2 pre svoj beh"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim vyžaduje pywin32 na spustenie"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7693,11 +7767,11 @@ msgstr ""
 "získať na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim už beží"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7705,35 +7779,35 @@ msgstr ""
 "Pravdepodobne už jeden program Gajim beží\n"
 "Želáte si aj napriek tomu spustiť Gajim?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Vložiť heslo ku GPG kľúču pre účet %(keyid)s (account %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "CRL vypršal"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Budete pripojený k %s bez OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Nesprávna passfráza"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7741,60 +7815,60 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Prijať túto požiadavku?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Overenie HTTP (%(method)s) pre %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Spojenie zlyhalo"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Požiadavka o zapísanie"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 "Kontakt \"%s\" vás autorizoval, aby ste mohol vidieť jeho alebo jej stav."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7802,78 +7876,78 @@ msgstr ""
 "Budete vždy vidieť jeho alebo ju ako neprihlásený.\n"
 "Chcete odstrániť jeho alebo ju zo zoznamu kontaktov?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Odhlásiť"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je známy ako %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je teraz %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s má nastavený predmet na %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Zaznamenávanie miestnosti je teraz povolené"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávanie miestnosti je teraz zakázané"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Miestnosť je teraz neanonymná"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Miestnosť je teraz poloanonymná"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Miestnosť je teraz anonymná"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Pre prihlásenie do miestnosti %s je potrebné heslo. Zadajte ho, prosím."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7881,32 +7955,38 @@ msgstr ""
 "Nastavili ste Gajim aby používal GPG agenta, ale tu nie je žiadny spustený "
 "GPG agent alebo vrátil nesprávne heslo.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojený bez vášho OpenPGP kľúča."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Vaša passfráza je nesprávna"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG je nepoužitelný"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "Znovu sa už _nepýtať"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7915,12 +7995,12 @@ msgstr ""
 "Správca zväzku kľúčov je nainštalovaný, ale \t\t\t\t\t\t\tnesprávne spustený "
 "(pravdepodobne je \t\t\t\t\t\t\tnesprávne nastavená premenná prostredia)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový e-mail %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7928,7 +8008,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -7943,90 +8023,90 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vám chce poslať súbor."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Chyba čítania súboru:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Úspešne prijatý súbor %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Úspešne odoslaný súbor %(filename)s pre %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Nepodarilo sa dešifrovať správu"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Konflikt používateľských mien"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Chyba."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Konflikt zdroju"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Chyba overovania SSL certifikátu"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8034,15 +8114,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovať túto chybu pre tento certifikát."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8059,11 +8139,11 @@ msgstr ""
 "\n"
 "Chcete sa predsa len pripojiť a aktualizovať odtlačok certifikátu?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8071,11 +8151,11 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Ste si istý, "
 "že to chcete urobiť?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Áno, chcem sa naozaj pripojiť nezabezpečene"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8083,28 +8163,28 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Mali by ste "
 "tomu predíssť nainštalovaním PyOpenSSL. Ste si istý, že to chcete urobiť?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Emotikony zakázané"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 "Vami nastavená téma emotikôn nebola nájdená, takže emotikony budú zakázané."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8114,13 +8194,13 @@ msgstr ""
 "aktualizovať formát súboru emoticons.py. Pre viac podrobností pozrite http://"
 "trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ ste neviditeľný"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia"
 
@@ -8152,12 +8232,13 @@ msgid ""
 msgstr ""
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "účet"
 
@@ -8184,9 +8265,9 @@ msgstr ""
 "jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
 "neviditeľný"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "správa"
 
@@ -8203,22 +8284,46 @@ msgstr ""
 "účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Zmeniť stav účtu alebo účtov"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_ta:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Chcem si za_registrovať nový účet"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"zmeniť stav účtu \"účet\". Ak nie je špecifikovaný, pokús sa zmeniť všetky "
+"účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Zobrazí diskusné okno, takže môžete odoslať správu kontaktu"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, s ktorým chcete komunikovať"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ak je špecifikované, kontakt je zobraný zo zoznamu pre tento účet"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8228,30 +8333,30 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, ktorý prijme správu"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "obsah správy"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp kľúč"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ak je špecifikovaný, správa bude zašifrovaná s použitím verejného kľúča"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "ak je špecifikovaný, správa bude odoslaná s použitím tohoto účtu"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8261,136 +8366,136 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "predmet"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "predmet správy"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Získať podrobné informácie o kontakte"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Získať podrobné informácie o účte"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Názov účtu"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Poslať súbor kontaktu"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "súbor"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "ak je špecifikovaný, súbor bude odoslaný s použitím tohto účtom"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Výpis všetkých nastavení a ich hodnôt"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastavuje hodnotu 'kľúča' na 'hodnotu'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "kľúč=hodnota"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'kľúč' je názov vlastnosti, 'hodnota' je hodnota, na ktorú má byť nastavený"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Odstrániť položku predvoľby"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "kľúč"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "názov nastavenia, ktoré má byť zmazané"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuálny stav nastavení programu Gajim do súboru .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Pridá kontakt do zoznamu"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Pridá nový kontakt do tohto účtu"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vráti aktuálny stav (použije sa globálny, pokiaľ nie je vybraný účet)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Vráti aktuálnu správu o stave (použije sa globálny, pokiaľ nie je vybraný "
 "účet)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Vráti počet neprečítaných správ"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvorí dialóg 'Začiatok diskusie'"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Začať rozhovor s použitím účtu %s"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Odoslať vlastné XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML na odoslanie"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8398,72 +8503,72 @@ msgstr ""
 "Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
 "všetkým účtom"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Účet ktorý chcete ovládať"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "obsah správy"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Pripojiť MUC miestnosť"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "miestnosť"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "JID miestnosti"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "prezývka"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Prezývka na používanie"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "heslo"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Heslo pre vstup do miestnosti"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Kontrolovať, či je Gajim spustený"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Zobraziť alebo skryť okno ipython"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Chýbajúci argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8472,15 +8577,15 @@ msgstr ""
 "'%s' nie je vo vašom zozname.\n"
 "Prosím, špecifikujte účet, z ktorého odoslať správu."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Vyzerá že Gajim nebeží. Nemôžete tak použiť gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8489,16 +8594,16 @@ msgstr ""
 "Použitie: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s nenájdený"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8507,7 +8612,7 @@ msgstr ""
 "Použitie: %s príkaz [argumenty]\n"
 "Príkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8516,7 +8621,7 @@ msgstr ""
 "Príliš veľa argumentov. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8525,7 +8630,7 @@ msgstr ""
 "Argument \"%(arg)s\" nie je špecifikovaný. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Nesprávna uri"
 
@@ -8554,310 +8659,170 @@ msgstr "Nemôžete odstrániť súčastnú tému"
 msgid "Please first choose another for your current theme."
 msgstr "Prosím, vyberte najskôr inú tému ako sučastnú."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Vložiť prezývku"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Rozhovor s "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Pokračovanie rozhovoru"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Zaznamenávanie miestosti je povolené"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Bola vytvorená nová miestnosť"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s bol vykopnutý %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s bol zakázaný %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy ako %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "príslušnosť zmenená"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "nastavenie miestnosti sa zmenilo na len členovia"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "vypnutie systému"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rola %(nick)s bola nastavená na %(role)s kontaktom %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rola %(nick)s bola nastavená na %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Prezývka nenájdená: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Diskusná skupina nemá nastavený predmet"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Pozvaný %(contact_jid)s do %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Prezývka nenájdená: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Použitie: /%s <prezývka|JID> [dôvod], zakáže JID v diskusnej skupine. "
-"Prezývka človeka môže byť zmenená, ale nesmie obsahovať \"@\". Ak je JID "
-"práve v diskusnej skupine, on/ona/ono bude vykoponutý. Medzery v prezývkach "
-"nie sú podporované."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Použite: /%s <prezývka>, otvorí okno sukromného rozhovoru s určeným "
-"používateľom."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Použitie: /%s [dôvod], zatvorí aktuálnu kartu v okne a zobrazí zdôvodnenie, "
-"pokiaľ je špecifikované."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Použitie: /%s <JID> [dôvod], pozve JID do aktuálnej diskusnej skupiny, "
-"prípadne sa zobrazí aj dôvod."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Použitie: /%s <miestnosť>@<server>[/prezývka], ponúkne možnosť pripojiť sa "
-"do miestnosť@server pre prezývku, ak je špecifikovaný."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Použitie: /%s <prezývka> [dôvod], odstráni navštevníka z diskusnej skupiny "
-"podľa prezývky, prípadne zobrazí dôvod. Medzery v prezývkach nie sú "
-"podporované."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Použitie: /%s <prezývka> [správa], otvorí okno sukromného rozhovoru a pošle "
-"správu určenému používateľovi podľa prezývky."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Použitie: /%s <prezývka>, zmení prezývku v aktuálnej diskusnej skupine."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Použitie: /%s , zobrazí mená členov v diskusnej skupine."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Použitie: /%s [téma], zobrazí alebo aktualizuje tému v diskusnej skupine."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Použitie: /%s <správa>, odošle správu, bezohľadu na ďalšie príkazy."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Použitie: /%s <prezývka>, zmení prezývku v aktuálnej diskusnej skupine."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ak zatvoríte okno, budete odpojený z tejto diskusnej skupiny."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Ničí sa %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Môžete dole špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazujem %s"
@@ -8930,6 +8895,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Nová diskusná skupina"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Chcem si vás pridať do svojho zoznamu"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Nie je možné nájsť databázu so záznamami o histórii"
@@ -9014,52 +8987,62 @@ msgstr "História konverzácie s %s"
 msgid "Disk Error"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Chybová správa: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Chyba."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Vypršal čas nahrávania obrázku"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Obrázok je príliš veľký"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Nie ste pripojený k serveru"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Skutočne si želáte zmazať vybraných správ?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Diskusné skupiny"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Správy"
 
@@ -9120,18 +9103,18 @@ msgstr "_Ignorovať"
 msgid "Retrieving profile..."
 msgstr "Získava sa profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Súbor je prázdny"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Súbor neexistuje"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Nie je možné načítať obrázok"
 
@@ -9163,47 +9146,47 @@ msgstr ""
 "Nastala chyba pri zverejňovaní vašich osobných údajov, skúste to prosím "
 "neskôr."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Zlúčené účty"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Ak \"%s\" akceptuje túto požiadavku, budete vidieť jeho alebo jej stav."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Odteraz vás \"%s\" uvidí len v stave odhlásený."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelný"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Ste v jednej alebo viacerých diskusných skupinách"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9212,28 +9195,28 @@ msgstr ""
 "diskusných skupín. Ste si skutočne istý, že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9241,16 +9224,16 @@ msgstr ""
 "Správu bude možné prečítať neskôr len vtedy, ak máte povolenú históriu a "
 "kontakt je vo vašom zozname kontaktov."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Musíte si ich prečítať pred odstránením tohoto transportu."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9258,11 +9241,11 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transport bude odstránený"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9271,58 +9254,71 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
+"pokračovať?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Premenovať kontakt"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadať novú prezývku pre kontakt %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Premenovať skupinu"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadať nové meno skupiny %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Odstrániť skupinu"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chcete skutočne odstrániť skupinu %s zo zoznamu kontaktov?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 "Tiež odstráni všetky kontakty v tejto skupine z vášho zoznamu kontaktov"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Prideliť Open_PGP kľúč"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9331,11 +9327,11 @@ msgstr ""
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovať?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9343,16 +9339,16 @@ msgstr ""
 "Odstránením tohto kontaktu, automaticky odstránite aj autorizáciu, to "
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Chcem upozorniť kontakt, na to, že bol odstránený"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakt bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9362,20 +9358,35 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
+"pokračovať?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť komunikovať s ostatnými."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Server nepodporuje ukladanie metakontaktov"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9383,25 +9394,25 @@ msgstr ""
 "Váš server nepodporuje ukladanie informácií metakontaktov. Tak tieto "
 "informácie nebudú uložené pri ďalšom prihlásení."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Neplatná URI súboru:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9409,12 +9420,12 @@ msgstr[0] "Chcete poslať tieto súbory účtu %s:"
 msgstr[1] "Chcete poslať tento súbor účtu %s:"
 msgstr[2] "Chcete poslať tieto súbory účtu %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Poslať %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Poslať súbor kontaktu"
@@ -9424,115 +9435,127 @@ msgstr "Poslať súbor kontaktu"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "použiť účet %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "pre %s účet"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "použiť %s účet"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Spravovať záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Hudba"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Nastavovať služby..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maximalizovať všetko"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Poslať sprá_vu skupine"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Všetkým používateľom"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Všetkým pripojeným používateľom"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Chcem si vás pridať do svojho zoznamu"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "S_pravovať kontakty"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Upraviť _skupiny"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Poslať krátku správu"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Vykonať príkaz..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "S_pravovať transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Upraviť transport"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Premenovať"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "Ma_ximalizovať"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "O_dpojiť"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Nová diskusná skupina"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "O_dpojiť"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Správca histórie"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Pripojiť sa k diskusnej skupine"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Zmeniť správu o stave..."
 
@@ -9549,20 +9572,20 @@ msgstr ""
 msgid "No result"
 msgstr "Žiadny výsledok"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Predmet: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Potvrdiť tieto voľby relácie"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9572,7 +9595,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9767,6 +9790,131 @@ msgstr ""
 msgid " resource with priority "
 msgstr " zdroj s prioritou "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Pridať špeciálne _upozornenie"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Prideliť Open_PGP kľúč"
+
+#~ msgid "Commands: %s"
+#~ msgstr "Príkazy: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Použitie: /%s, vyčistí textové okno."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Použitie: /%s, skryje tlačidlá rozhovoru."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Použitie: /%(command)s <akcia>, odošle akciu pre aktuálnu diskusnú "
+#~ "skupinu. Použite tretiu osobu. (napr. /%(command)s explodoval.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Použitie: /%s, pošle ping kontaktu"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Použitie: /%s, pošle správu kontaktu"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Žiadne informácie s pomocou pre /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Povoliť link-local/zeroconf správy"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Prezývka nenájdená: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Diskusná skupina nemá nastavený predmet"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Pozvaný %(contact_jid)s do %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Prezývka nenájdená: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Použitie: /%s <prezývka|JID> [dôvod], zakáže JID v diskusnej skupine. "
+#~ "Prezývka človeka môže byť zmenená, ale nesmie obsahovať \"@\". Ak je JID "
+#~ "práve v diskusnej skupine, on/ona/ono bude vykoponutý. Medzery v "
+#~ "prezývkach nie sú podporované."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Použite: /%s <prezývka>, otvorí okno sukromného rozhovoru s určeným "
+#~ "používateľom."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Použitie: /%s [dôvod], zatvorí aktuálnu kartu v okne a zobrazí "
+#~ "zdôvodnenie, pokiaľ je špecifikované."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Použitie: /%s <JID> [dôvod], pozve JID do aktuálnej diskusnej skupiny, "
+#~ "prípadne sa zobrazí aj dôvod."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Použitie: /%s <miestnosť>@<server>[/prezývka], ponúkne možnosť pripojiť "
+#~ "sa do miestnosť@server pre prezývku, ak je špecifikovaný."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Použitie: /%s <prezývka> [dôvod], odstráni navštevníka z diskusnej "
+#~ "skupiny podľa prezývky, prípadne zobrazí dôvod. Medzery v prezývkach nie "
+#~ "sú podporované."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Použitie: /%s <prezývka> [správa], otvorí okno sukromného rozhovoru a "
+#~ "pošle správu určenému používateľovi podľa prezývky."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Použitie: /%s <prezývka>, zmení prezývku v aktuálnej diskusnej skupine."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Použitie: /%s , zobrazí mená členov v diskusnej skupine."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Použitie: /%s [téma], zobrazí alebo aktualizuje tému v diskusnej skupine."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr "Použitie: /%s <správa>, odošle správu, bezohľadu na ďalšie príkazy."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Použitie: /%s <prezývka>, zmení prezývku v aktuálnej diskusnej skupine."
+
 #~ msgid "Your JID:"
 #~ msgstr "Vaše JID:"
 
diff --git a/po/sr.po b/po/sr.po
index b188ad1ad..083143a6d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-20 00:04+0200\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
@@ -216,6 +216,7 @@ msgstr "<b>Личне информације</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Налог"
 
@@ -282,8 +283,8 @@ msgstr "Измени личне информације"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Гајим"
@@ -294,8 +295,8 @@ msgstr "Гајим"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Опште"
 
@@ -355,25 +356,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Информације о Вама, како су ускладиштене на серверу"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Није одабран ниједан кључ"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ништа"
 
@@ -529,8 +526,8 @@ msgstr ""
 "Могли бисте узети у обзир и могућност измене подешавања firewall-а."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Џабер ИД:"
 
@@ -544,7 +541,7 @@ msgid "Mer_ge accounts"
 msgstr "_Споји налоге"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Преи_менуј"
 
@@ -806,7 +803,7 @@ msgid "All statuses"
 msgstr "Сви статуси"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Одсутан"
 
@@ -823,7 +820,7 @@ msgid "Have "
 msgstr "Имам "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Невидљив"
 
@@ -832,7 +829,7 @@ msgid "Launch a command"
 msgstr "Покрените команду"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Недоступан"
 
@@ -1016,7 +1013,7 @@ msgid "Join _Group Chat"
 msgstr "Прикључи се _групном разговору"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Додај на листу контаката..."
 
@@ -1042,39 +1039,6 @@ msgstr "_Отвори везу у интернет прегледачу"
 msgid "_Start Chat"
 msgstr "_Започни разговор"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Позови контакте"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Пошаљи _датотеку"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Укључи/искључи енкрипцију с краја на крај"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Укључи/искључи Open_PGP енкрипцију"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Додај на листу контаката"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Историјат"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "Позо_ви"
@@ -1099,6 +1063,119 @@ msgstr ""
 "Започећете групни разговор.\n"
 "Одаберите контакте које желите да позовете"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Тражи његов/њен статус"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Додај посеб_но обавештење..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Придружи Open_PGP Кључ..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Изврши наредбу..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Измени _групе..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "Позо_ви у"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Позови контакте"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "_Уклони"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Пошаљи кориснички дефинисан статус"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Пошаљи једну _поруку..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Пошаљи _датотеку..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Постави кориснички дефинисан аватар..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Започни ра_зговор"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Укључи/искључи енкрипцију с краја на крај"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Укључи/искључи Open_PGP енкрипцију"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Дозволи му/јој да види мој статус"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Блокирај"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Забрани му/јој да види мој статус"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Историјат"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Игнориши"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Управљање контактима"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Преименуј..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Претплата"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Одблокирај"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Поништи игнрисање"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Попуните формулар."
@@ -1215,7 +1292,7 @@ msgstr ""
 "Ред контаката\n"
 "Банер разговора"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Подебљано"
 
@@ -1239,7 +1316,7 @@ msgstr "Отишао"
 msgid "Inactive"
 msgstr "Неактивно"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Курзив"
 
@@ -1311,6 +1388,14 @@ msgstr "Мо_дератор"
 msgid "Occupant Actions"
 msgstr "_Акције присутних"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Пошаљи _датотеку"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Додај на листу контаката"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Админ"
@@ -1319,13 +1404,6 @@ msgstr "_Админ"
 msgid "_Ban"
 msgstr "_Забрани"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Блокирај"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Избаци"
@@ -1342,13 +1420,6 @@ msgstr "_Власник"
 msgid "_Send Private Message"
 msgstr "_Пошаљи приватну поруку"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Одблокирај"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Глас"
@@ -1357,7 +1428,7 @@ msgstr "_Глас"
 msgid "Create new post"
 msgstr "Направи нову објаву"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Од"
 
@@ -1381,8 +1452,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добродошли у Гајимов менаџер дневника историјата</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Обриши"
 
@@ -1435,34 +1506,39 @@ msgstr "Претрага:"
 msgid "_Log conversation history"
 msgstr "_Памти у дневнику историјат разговора"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "_Маркирај ову собу (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Придружи се групном разговору"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Уђи у ову собу аутоматски када се повежем"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Надимак:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Недавно:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Соба:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Придружи се"
@@ -1492,7 +1568,7 @@ msgstr "Умањи прозор на ауто повезивање"
 msgid "Print status:"
 msgstr "Испис статуса:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -2029,7 +2105,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Сортирај контакте по статусу"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Статус"
 
@@ -2196,34 +2272,39 @@ msgid "All"
 msgstr "Сви"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "све према претплати"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Дозволи"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Одбиј"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "Џабер ИД"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Поредак:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Листа приватности"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "све према претплати"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "све у групи"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2235,19 +2316,19 @@ msgstr ""
 "од\n"
 "за"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "да ми шаље поруке"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "да ми шаље упите"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "да ми пошаље статус"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "да види мој статус"
 
@@ -2415,96 +2496,11 @@ msgstr "Уклони налог и из Гајима и са сервера"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Тражи његов/њен статус"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Додај посеб_но обавештење..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Придружи Open_PGP Кључ..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Измени _групе..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Изврши наредбу..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "Позо_ви у"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "_Уклони"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Пошаљи кориснички дефинисан статус"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Пошаљи једну _поруку..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Пошаљи _датотеку..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Постави кориснички дефинисан аватар..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Започни ра_зговор"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Дозволи му/јој да види мој статус"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Забрани му/јој да види мој статус"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Игнориши"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Управљање контактима"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Преименуј..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Претплата"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Поништи игнрисање"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2626,7 +2622,7 @@ msgid "_Add contact"
 msgstr "Додај _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "Информације"
 
@@ -2839,26 +2835,6 @@ msgstr "_Порука"
 msgid "_Presence"
 msgstr "_Присутност"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Додај посеб_но обавештење"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Придружи Open_PGP Кључ"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Измени _групе"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Преименуј"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Измени налог..."
@@ -2902,48 +2878,48 @@ msgid "Service returned an error."
 msgstr "Сервис је вратио грешку."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Активирано"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Деактивирано"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Да/Не"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Цео број"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Боја"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Име поставке"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Вредност"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(ништа)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Скривен"
 
@@ -2957,187 +2933,186 @@ msgstr "Примили сте нови унос:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Енглески"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Белоруски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Бугарски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Бретански"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Чешки"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Немачки"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Грчки"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Британски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Шпански"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Баскијски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Француски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Хрватски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Италијански"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Норвешки (б)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Холандски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Норвешки"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Пољски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Португалски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Бразилски португалски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Руски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Српски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Словачки"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Шведски"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Кинески (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Језик за правопис"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Веза није доступна"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваша порука не може бити послата ако нисте повезани."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Недефинисан"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Болестан"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Информације контакта"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Стварно пошаљи датотеку?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Ако пошаљете датотеку контакту %s, он/она ће знати Ваш прави џабер ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG енкрипција омогућена"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Није на листи контаката"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Листа преноса активних, завршених и заустављених датотека"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Непознат извођач"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Непознат наслов"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Непознат извор"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3146,17 +3121,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> од <i>%(artist)s</i>\n"
 "из <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s са групног разговора у соби %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Нема додељеног GPG кључа"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3164,50 +3139,50 @@ msgstr ""
 "Ниједан GPG кључ није додаљен овом контакту. Не можете шифровати поруке са "
 "GPG-ом."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG енкрипција онемогућена"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Сесија ЋЕ бити памћена"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Сесија НЕЋЕ бити памћена"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "је"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "НИЈЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "ће"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "НЕЋЕ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "и аутентификовани"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "и НЕаутентификовани"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3216,91 +3191,48 @@ msgstr ""
 "%(type)s шифровање %(status)s активан %(authenticated)s.\n"
 "Ваша сесија разговора %(logged)s бити памћена."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Команда није подржана за zeroconf  налог."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Команда: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Начин коришћења: /%s, празни текстуални прозор"
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Начин коришћења: /%s, сакрива дугмад."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Начин коришћења: /%(command)s <action>, шаље акцију тренутном групном "
-"разговору. Користититреће лице. (нпр. /%(command)s је експлодирао.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Начин коришћења: /%s, шаље пинк контакту"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Начин коришћења: /%s, шаље поруку контакту"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Нема информација ни помоћи за /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Успостављање сесије прекинуто"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Ова сесија је шифрована"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr "и БИЋЕ памћена"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr "и НЕЋЕ бити памћена"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Идентитет другог корисника није потврђен. Кликните на штит за више детаља."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E енкрипција онемогућена"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Следећа порука НИЈЕ била шифрована"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Следећа порука је била шифрована"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Вам је управо послао поруку"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3308,15 +3240,15 @@ msgstr ""
 "Ако затворите овај језичак, а историјат разговора није омогућен, ова порука "
 "ће бити изгубљена."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Грешка са базом података"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3325,7 +3257,7 @@ msgstr ""
 "Датотека базе података (%s) се не може читати. Покушајте да је поправите или "
 "уклоните (сав историјат порука ће бити изгубљен)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s је сада %(status)s"
@@ -3334,23 +3266,23 @@ msgstr "%(name)s је сада %(status)s"
 msgid "creating logs database"
 msgstr "креирам базу дневника"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s је датотека, али би требала бити фасцикла"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Гајим ће се сада завршити"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jе фасцикла, али би требала бити датотека"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "креирам фасциклу %s"
@@ -3414,9 +3346,9 @@ msgstr "Одаберите групне разговоре које желите
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Групни разговори"
 
@@ -3432,72 +3364,113 @@ msgstr "Проследи непрочитане поруке"
 msgid "All unread messages have been forwarded."
 msgstr "Све непрочитане поруке су прослеђене."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Користи ДБус и демон обавештења за приказивање обавештења"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време у минутама, наком кога ће се Ваш статус промеити у Одсутан."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Одсутан, као последица мировања више од $T мин.)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S ће бити замењено са тренутном статусном поруком,$T са временом одсутности."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Време у минутама, наком кога ће се Ваш статус промеити у Није доступан."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Није доступан, као последица мировања више од $T мин.)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S ће бити замењено са тренутном статусном поруком,$T са временом "
 "недоступности"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Неисправан надимак"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "текст статусне поруке"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Неисправан надимак"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Промена надимка"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "текст статусне поруке"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Листа (одвојена бланко знаковима) редова (налога и група) који су отворени."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "подразумевано"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Омогући локалну везу/zeroconf поруке"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Језик који користи правопис"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3507,7 +3480,7 @@ msgstr ""
 "'понекад' - исписуј време сваких print_ichat_every_foo_minutes минута.\n"
 "'никад' - никад не исписуј време."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3518,18 +3491,18 @@ msgstr ""
 "најнепрецизнији. Ово се користи само уколико је приказивање_времена "
 "поставњено на 'понекад'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Сматрај * / _ парове као знакове за форматирање."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ако је истинито, не уклањај */_ . Тако ће *абв* бити подебљано, али "
 "иокружено са * *."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3540,7 +3513,7 @@ msgstr ""
 "ref/rst/restructuredtext.html (Ако желите да користите ово, инсталирајте "
 "docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3548,7 +3521,7 @@ msgstr ""
 "Карактер за додавање после надимка када се користи довршавање надимка "
 "(тастером tab) у групном разговору"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3556,7 +3529,7 @@ msgstr ""
 "Карактер који желите додати после жељеног надимка уколико је жељени надимак "
 "у групном разговору већ употребљен"
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3567,19 +3540,19 @@ msgstr ""
 "документацију за strftime, за пуну документацију: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Карактери који ће бити приказани пре надимка у разговору"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Карактери који ће бити приказани после надимка у разговору"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Додај * и [n] у наслов листе контаката?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3587,11 +3560,25 @@ msgstr ""
 "Колико линија претходног разговора памтити када се прозор/језичак  за "
 "разговор поново отвори."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колико минута да трају линије претходног разговора."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3599,11 +3586,11 @@ msgstr ""
 "Пошаљи поруку са Ctrl+Enter, а са Enter прави нову линију. (Подразумевано "
 "понашање Миралабисовог ICQ клијента)"
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колико линија сачувати са Ctrl+KeyUP"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3612,11 +3599,11 @@ msgstr ""
 "Или Ваш специфицирани УРЛ са %s у њему где је %s реч или фраза или 'ВИКИ-"
 "РЕЧНИК' што значи коришћење вики-речника."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ако је означено, Гајим се може контролисати коришћењем gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3627,14 +3614,14 @@ msgstr ""
 "рачуна (ако немају listen_to_network_manager постављен на неистинито и "
 "синхронизуј са глобалним статусом) у зависности од статуса мрежне конекције."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Послата обавештења о стању разговора. Може бити једно од "
 "'сви','само_састављање', 'онемогућено'."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3642,7 +3629,7 @@ msgstr ""
 "Приказана обавештења о стању разговора у прозору за разговор. Може бити "
 "једно од 'сви', 'само_састављање', 'онемогућено'."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3650,11 +3637,11 @@ msgstr ""
 "Ако се не исписује време за сваку поруку (print_time==понекад), исписати га "
 "сваких x минута"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питај пре затварања прозора/језичка групног разговора."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3662,7 +3649,7 @@ msgstr ""
 "Увек питај пре затварања језичка/прозора када је у питању ова листа одвојена "
 "бланко карактерима џабер ИД-ова групних разговора."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3670,13 +3657,13 @@ msgstr ""
 "Никад не питај пре затварања језичка/прозора групног разговора када је у "
 "питању ова листаодовојена бланко знацима џабер ИД-ова групних разговора."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3684,27 +3671,27 @@ msgstr ""
 "Листа хостова одвојена зарезима, коју шаљемо, уз локалне интерефејсе, за "
 "трансфер датотека, у случају прослеђивања порта/НАТовања."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандард дефинише КiБ = 1024 бајтова, КБ = 1000 бајтова"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Обавести ме о свим догађајима у икони системске касете."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Прикажи језичак иако је само један разговор?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Прикаши границу свеске у прозорима разговора?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Прикаши дугме за затварање у језичку?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3715,18 +3702,18 @@ msgstr ""
 "приоритет, одвојени зарезима. Валидне групе су 1, 2, 5, 14, 15, 16, 17 и 18. "
 "Вишљи бројеви су сугурнији, али тада треба више времена за почетак сесије."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Прегледај нове поруке у искачућим обавештењима?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Листа речи одвојена бланко карактерима које ће бити обојене у групним "
 "разговорима"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3734,14 +3721,14 @@ msgstr ""
 "Ако је истинито, Гајим се завршава када се притисне X дугме. Ово подешавање "
 "се користи само ако је икона системске касете у употреби."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ако је истинито, Гајим проверава да ли је подразумевани џабер клијент на "
 "сваком стартовању."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3749,7 +3736,7 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати икону на сваком језичку који садржи "
 "непрочитане поруке. У зависности од теме, икона може бити и анимирана."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3757,12 +3744,12 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати статусну поруку (ако није празна) за "
 "сваки контакт у листи контаката"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Дефинишите позицију аватара у листи контаката. Може бити лево или десно"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3770,7 +3757,7 @@ msgstr ""
 "Ако је истинито, Гајим ће послати упит за аватар за сваки контакт који "
 "прошлог пута није  имао аватар или је онај у меморији престар"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3778,7 +3765,7 @@ msgstr ""
 "Ако је неистинито, више нећете видети статусну порукуу разговорима када "
 "контакт промени свој статус и/или статусну поруку."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3792,30 +3779,30 @@ msgstr ""
 "све статусне поруке. Ако је \"in_and_out\". Гајим ће приказивати само поруке "
 "типа тај и тај је ушао/изашао у/из собе."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Боја позадине контакта када тек дођу на везу."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Боја позадине контакта када тек оду са везе."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ако је истинито, враћене поруке из историјата ће бити мањег фонта од "
 "подразумеваног."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Не приказуј аватар за сам транспорт."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Не приказуј листу контаката у системској касети."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3825,7 +3812,7 @@ msgstr ""
 "прозор бљеска (подразумевано понашање у већини менаџера прозора) при новим "
 "догађајима."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3836,7 +3823,7 @@ msgstr ""
 "у групним разговорима"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3855,31 +3842,31 @@ msgstr ""
 "'pertype' - Поруке истог типа (нпр., разговори и групни разговори) се шаљу у "
 "исти прозор."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ако није истинито, нећете више видети аватар у прозору разговора."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ако је истинито, притисак на тастер 'esc' затвара језичак/прозор."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Сакрива дугмад у прозорима разговора."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Сакрива банер у прозору групног разговора."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Сакрива банер у прозору разговора две особе"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Сакрива листу учесника у прозору групног разговора"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3887,15 +3874,15 @@ msgstr ""
 "У разговору, прикажи надимак на почетку новог реда само када се не ради о "
 "истој особи која је причала и у прошлој поруци."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Увлачење при коришћењу спајања узастопних надимака."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Глатко скроловање у прозору разговора"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3903,11 +3890,11 @@ msgstr ""
 "Листа боја одвојена са \":\" које ће бити коришћене за бојење надимака у "
 "групним разговорима."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab иде на следећи језичак када нема непрочитаних језичака"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3915,7 +3902,25 @@ msgstr ""
 "Треба ли питати за потврду стварања псеудоконтакта или не? Празан низ значи "
 "да никада не приказујемо упит."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Треба ли питати за потврду стварања псеудоконтакта или не? Празан низ значи "
+"да никада не приказујемо упит."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Треба ли питати за потврду стварања псеудоконтакта или не? Празан низ значи "
+"да никада не приказујемо упит."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3925,7 +3930,7 @@ msgstr ""
 "налог у прозору за измену подешавања налога. БУДИТЕ ОПРЕЗНИ, када сте "
 "повезани са негативним приоритетом НЕЋЕТЕ примати никакве поруке од сервера."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3933,7 +3938,7 @@ msgstr ""
 "Ако је истинито, Гајим ће користити Гномов Keyring (ако је доступан) да "
 "ускладишти лозинке налога."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3942,7 +3947,7 @@ msgstr ""
 "Ако је истинито, Гајим ће користити Гномов Keyring (ако је доступан) да "
 "ускладишти лозинке налога."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3950,7 +3955,7 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати укупан број корисника и број коринсика "
 "на вези у групним редовима."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3958,7 +3963,7 @@ msgstr ""
 "Може бити празно, 'chat' или 'normal'. Ако није празно, третира све долазне "
 "поруке као поруке постављеног типа"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3966,7 +3971,7 @@ msgstr ""
 "Ако је истинито, Гајим ће скроловати и означити контакт који Вам је последњи "
 "послао поруку, ако прозор разговора није отворен."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3974,11 +3979,11 @@ msgstr ""
 "Ако је истинито, Гајим ће конвертовати све карактер између $$ и $$ у слику "
 "користећи dvips у ибацити је у прозор разговора."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Време неактивности после кога се прозор за измену статуса затвара."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3986,7 +3991,7 @@ msgstr ""
 "Максимум порука које се приказују у разоговору. Најстарије линије се "
 "склањају."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3994,18 +3999,18 @@ msgstr ""
 "Ако је истинито, прозор обавештења од сервиса обавештења ће бити закачен за "
 "системску касету."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Одаберите интервал између две провере да се ништа не дешава на рачунару."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr "Промените вредност да промените величину Латекс формула. Више је веће."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4014,13 +4019,23 @@ msgstr ""
 "Исправне uri шеме. Само шеме са ове листе ће бити прихваћене као \"стварне\" "
 "uri."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4028,7 +4043,7 @@ msgstr ""
 "Приоритет ће се аутоматски променити у зависности од Вашег статуса. "
 "Приоритети су дефинсани у autopriority_* подешавањима."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4037,26 +4052,37 @@ msgstr ""
 "dnd, invisible. ПАЖЊА: ова опција се користи само ако је "
 "restore_last_status  онемогућена."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Ако је омогућено, постави последњи коришћени статус."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Ако није истинито, нећете више видети аватар у прозору разговора."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ако је онемогућено, не потписуј присуство са GPG кључем, чак иако је GPG "
 "конфигурисан."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Омогући ESessions енкрипцију за овај налог."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Да ли ће Гајим аутоматски стартовати шифровану сесију ако је могуће?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4064,29 +4090,29 @@ msgstr ""
 "Уређена листа (одвојена зарезима) типова конекције за пробу. Може садржати "
 "tls, ssl или plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Прикажи прозор упозорења пре коришћења стандардне SSL библиотеке."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Листа ssl грешака за игнорисање, одвојена размацима."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4096,11 +4122,11 @@ msgstr ""
 "поновно успостављање везе."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 привремено решење"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4108,15 +4134,15 @@ msgstr ""
 "Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
 "дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Одговор на захтев примања"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Послати захтев примања"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4124,11 +4150,11 @@ msgstr ""
 "Када се успоставља шифрована сесија, да ли Гајим треба да претпостави да "
 "желите да чувате поруке у дневнику?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Да ли је OpenPGP омогућен за овај контакт?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4136,101 +4162,101 @@ msgstr ""
 "Да ли Гајим треба аутоматски да започне шифровану везу са овим контактом "
 "када је могуће?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Језик у коме желите проверавати неисправно написане речи"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "све или размаком одвојен статус"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'да', 'не', или 'обоје'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'да', 'не' или ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Спавам"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Враћам се брзо"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Враћам се за пар минута."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Једем"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Једем, оставите поруку."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Радим."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Радим."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Телефонирам."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Напољу"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Напољу сам, уживам у животу."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Доступан сам."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Слободан сам за разговор."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Одмах се враћам."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Недоступан сам."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Не сметај."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Поздрав!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4239,99 +4265,99 @@ msgstr ""
 "muc_highlight_words, или када нека порука групног разговора садржи Ваш "
 "надимак."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "намирнице"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "људска"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Није могуће учитавање модула idle"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Лош хост"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Невалидна локална адреса? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информације о регистрацији за транспорт %s нису дошле на време"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Региструј се на %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Веза прекинута"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Грешка при упису на диск"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Невидљивост није подржана"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Налог %s не подржава невидљивост."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4341,77 +4367,84 @@ msgstr ""
 "(погледајте http://trac.gajim.org/wiki/DatabaseBackup) или  уклоните (сав "
 "историјат порука ће бити изгубљен)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Недозвољен надимак: %s "
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Није могуће придружити се групном разговору"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Забрањен Вам је приступ овом групном разговору %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Групни разговор.%s не постоји."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Стварање групних разговора Вам није дозвољено."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Морате користити Ваш регистровани надимак у групном разговору %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Нисте у листи чланова групног разговора %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Соба групног разговора је уништена"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Можете се прикључити соби %s уместо ове"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Желео бих да те додам на моју листу контаката."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "сада сте претплаћени на %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "захтев за укидање претплате од контакта %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "сада Вам је укинута претплата од контакта %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4420,219 +4453,205 @@ msgstr ""
 "Џабер ИД %s не поштује RFC правила. Неће бити додат на Вашу листу контаката. "
 "Употребите алате као што је http://jru.jabberstudio.org/ да бисте га уклонили"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Лозинка за OpenPGP није унета"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Повезаћете се на %s без OpenPGP кључа."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Нисам успео да узмем сертификат издавача"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Нисам успео да узмем CRL сертификата"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Нисам успео да дешифрујем потпис сертификата"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Нисам успео да дешифрујем CRL сертификата"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Нисам успео да декодирам јавни кључ издавача"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Грешка у потпису сертификата"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Грешка у CRL сертификата"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Сертификат још није валидан"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Сертификат је истекао"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL није још валидан"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL је истекао"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка у формату сертифаковог поља од када је валидан"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка у формату сертифаковог поља до када је валидан"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Грешка у формату CRL-овогпоља последњег ажурирања"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Грешка у формату CRL-овогпоља следећег ажурирања"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Немам више меморије"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Самопотписани сертификат"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопотписани сертификат у ланцу сертификата"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "У немогућности да узмем сертификат локалног издавача"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "У немогућности да верификујем први сертификат"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Ланац сертификата предугачак"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Сертификат повучен"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Неисправан сертификат сертификационог тела (CA)"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Прекорачена дужина путање"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Неподржана сврха сертификата"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Сертификату се не верује"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Сертификат одбачен"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Погрешна тема издавача сертификата"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификатор кључа ауторизатора и теме се не поклапају"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серијски број ауторизатора и издавача се не поклапају"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Употреба кључа не укључује потписивање сертификата"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Верификација апликације неуспела"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Изгубљена веза са рачуном \"%s\""
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Поново се повежите ручно."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s је лоше одговорио на захтев регистрације:: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s је понудио другачију форму за регистрацију"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Непозната SSL грешка: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Неисправан одговор"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s је лоше одговорио на захтев регистрације: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Веза са \"%s\" није могућа"
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Проверите Вашу конекцију или покушајте касније."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Сачувано у: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Веза са проксијем прекинута"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Веза са %s није могућа"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Изгубљена веза са налогом %s. Покушајте поново да се конектујете."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Аутентичност сертификата %s може бити неисправна."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4641,7 +4660,7 @@ msgstr ""
 "\n"
 "SSL грешка: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4650,24 +4669,24 @@ msgstr ""
 "\n"
 "Непозната SSL грешка: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Проверите Вашу конекцију или покушајте касније"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Аутентикација са \"%s\" неуспешна"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Молимо Вас да проверите Ваше корисничко име и лозинку од грешака."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Грешка приликом уклањања листа приватности"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4676,30 +4695,30 @@ msgstr ""
 "Листа приватности %s није уклоњена. Можда је активна у неком од Ваших "
 "ресурса на вези. Деактивирајте је тамо и покушајте поново."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Није могуће послати празну датотеку"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Нити је удаљено присуство потписано, нити је кључ додељен."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "Кључ контакта (%s) не поклапа се са кључем придруженим у Гајиму."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ова порука је *шифрована* (Погледајте :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4708,30 +4727,40 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Позови контакте"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Није дохваћено због статуса невидљивости"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Веза прекинута"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Посматрачи"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Преноси"
 
@@ -4740,14 +4769,19 @@ msgid "Not in roster"
 msgstr "Није у листи контаката"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На овом рачунару недостају python везивања за D-Bus"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus могућности Гајима се не могу користити"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (познат као python-pysqlite2) недостаје. Излазим..."
@@ -4823,56 +4857,69 @@ msgid "eleven"
 msgstr "једанаест"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s сати"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s и пет"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s и десет"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s и петнаест"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s и двадесет"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s и двадесет и пет"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s i тридесет минута"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "двадесет и пет до %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "двадесет до %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "петнаест минута до %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "десет до %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "пет до %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s сати"
 
@@ -4940,190 +4987,190 @@ msgstr "Неисправан карактер у имену хоста."
 msgid "Invalid character in resource."
 msgstr "Неисправан карактер у ресурсу."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Заузет"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Недоступан"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Слободан за разговор"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Слободан за разговор"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Доступан"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Доступан"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Повезивање"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "О_дсутан"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Није на вези"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Није на вези"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Невидљив"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?контакт има статус:Непознат"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?контакт има статус:Постоје грешке"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Тренутна претплата:Ниједна"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Обоје"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Питај (за претплату):Ниједна"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Претплатите се"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Модератори"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Учесници"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Учесник"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Посетилац"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Везаност контакта у групном разоговру:Никаква"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Власник"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Члан"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "слуша конверзацију"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "ради нешто друго"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "пише поруку..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "пауза при писању поруке"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "је затворио/затворила прозор или језичак разговора"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5131,22 +5178,22 @@ msgstr[0] "%d порука чека"
 msgstr[1] "%d порука чекају"
 msgstr[2] "%d порука чека"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " из собе %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " од корисника %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " од %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5154,12 +5201,12 @@ msgstr[0] "%d догађај на чекању"
 msgstr[1] "%d догађаја на чекању"
 msgstr[2] "%d догађај на чекању"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Гајим - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Грешка приликом извршавања \"%(command)s\": %(error)s"
@@ -5175,11 +5222,11 @@ msgstr "%s није исправан ниво логовања"
 msgid "error: cannot open %s for reading"
 msgstr "грешка: не могу отворити %s за читање"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "цијан"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "пребацујем базу дневника у индексе"
 
@@ -5830,14 +5877,14 @@ msgstr ""
 "Можда већ имате покренуту инстанцу Гајима. Пренос датотека ће бити прекинут."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 "[Ово је део шифроване сесије. Уколико видите ово, нешто је пошло наопако.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5846,17 +5893,29 @@ msgstr ""
 "Хост %s који сте поставили као ft_add_host_to_send напредно подешавање није "
 "исправан. па је игнорисан."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Лозинка за OpenPGP није унета"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Повезаћете се на %s без OpenPGP кључа."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Ако желите наставити са слањем и примањем порука, морате се искључити и "
 "поново доћи на везу."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Авахи грешка"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5865,31 +5924,31 @@ msgstr ""
 "%s\n"
 "Поруке локалне мреже можда неће радити како треба."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверите да ли је Авахи или Bonjour инсталиран."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Није могуће покренути локални сервис"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не могу се повезати на порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Молимо проверите да ли је avahi-демон покренут."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Није могуће променити статус рачуна \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5897,20 +5956,20 @@ msgstr ""
 "Нисте спојени или сте невидљиви за друге. Ваша порука не може бити послата."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Ова порука је шифрована]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Ваша порука није могла бити послата."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт није на вези. Вашу поруку није могуће послати."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5922,24 +5981,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Грешка приликом додавања сервиса. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Онемогућено"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Подразумевана порука"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Омогућен"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Речник за језик %s није доступан"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5948,211 +6007,217 @@ msgstr ""
 "Морате инсталирати %s речник како бисте могли користити проверу правописа, "
 "или одаберите други језик поставком speller_language опције."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "наслов статусне поруке"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "текст статусне поруке"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Отићи са везе и повезати се одмах?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако желите да се све промене тренутно примене, морате да се поново повежете."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP није могуће користити на овом рачунару"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Непрочитани догађаји"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Прочитајте све догађаје на чекању пре уклањања налога."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Отворили сте разговор у рачуну %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Тренутно сте спојени на сервер"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "За промену имена налога, морате отићи са везе."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Да бисте променили име налога, морате прво прочитати све догађаје на чекању."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Име Налога Већ У Употреби"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ово име већ користи један од Ваших налога. Молимо Вас, одаберите друго име."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Неисправно име налога"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Име налога не може бити празно."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Име налога не може да садржи белине."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Преименуј налог"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Унесите ново име за налог%s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Џабер ИД мора бити облика \"корисник@сервер\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Неисправан унос"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Ваш порт мора бити број порта."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Неуспело узимање тајних кључева"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Дошло је до проблема у узимању Ваших OpenPGP тајних кључева."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Одабир OpenPGP Кључева"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Одаберите Ваш OpenPGP кључ"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Није доступан такав налог"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Морате направити Ваш налог пре измена личних информација."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Нисте повезани на сервер"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без везе са сервером, није могућа измена личних информација."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не подржава Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може да сачува Ваше личне информације."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "За промену имена налога, морате отићи са везе."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Рачун локал већ постоји."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Молимо Вас, преименујте или уклоните пре омогућавања локалних порука."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Измени %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Региструј се на %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Листа забрана"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Листа чланова"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Листа власника"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Листа администратора"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "ЏИД"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Разлог"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Надимак"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Улога"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Забрана..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6160,11 +6225,11 @@ msgstr ""
 "<b>Кога желите забранити?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Додавање члана..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6172,11 +6237,11 @@ msgstr ""
 "<b>Кога желите да поставите чланом?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Додавање власника..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6184,11 +6249,11 @@ msgstr ""
 "<b>Кога желите да поставите за власника?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Додавање администратора..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6196,7 +6261,7 @@ msgstr ""
 "<b>Кога желите да поставите за администратора?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6213,122 +6278,121 @@ msgstr ""
 "4. домен (само се домен поклапа, као и било који корисник@домен,\n"
 "домен/ресурс, или адреса која садржи поддомен."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Уклањање рачуна %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Лозинка захтевана"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Сачувај лозинку"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Уколико га уклоните, веза ће бити изгубљена."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?испис статуса:Све"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Само ући и напустити"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Нови групни разговор"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Овај маркер има неисправне податке"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Молимо обавезно испуните поља сервера и собе или уклоните овај маркер."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Недозвољен надимак: %s "
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Неисправан сервер"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Неисправан унос"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Налог је успешно додат"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Можете поставити напредна подешавања налога притиском на дугме Напредно, или "
 "касније, кликом на ставку менија Налози под менијем Уреди из главног прозора."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Ваш нови налог је успешно направљен"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Неисправно корисничко име"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Морате уписати корисничко име да бисте конфигурисали овај налог."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Молимо одредите сервер на коме желите да се региструјете."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Сертификат је већ у датотеци"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат је већ у датотеци %s, па није поново додат."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6343,7 +6407,7 @@ msgstr ""
 "SSL грешка: %(error)s\n"
 "Да ли и даље желите да се повежете на овај сервер?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6354,63 +6418,63 @@ msgstr ""
 "SHA1 отисак овог сертификата:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Појавила се грешка при креирању налога"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Име налога је већ употребљено"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Већ имате налог са тим именом."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Активно"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "догађај"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Примљена Прва Порука"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Следећа Примљена Порука Фокусирана"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Следећа Примљена Порука Нефокусирана"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Контакт На Вези"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Контакт Отишао Са Везе"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Порука Послата"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Бојење Порука Са Групног Разговора"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Примљена Порука Са Групног Разговора"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Примљен Гмаил е-мејл"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6420,7 +6484,7 @@ msgstr ""
 "стигла на други крај. Ако ова икона остане овако \n"
 "дуго времена, вероватно је да се порука изгубила."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6428,74 +6492,74 @@ msgstr ""
 "Текст испод ове линије је оно што је речено од када сте последњи пут\n"
 "обратили пажњу на овај групни разговор"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Излаз"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Акције за налог \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Прочитајте чланак на _Википедији"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Потражи у Речнику"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "УРЛ-у Речника недостаје \"%s\" и није Вики речник"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "УРЛ-у Веб претраге недостаје \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Претражи Веб"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Отвори као _Везу"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Јуче"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "Пре %i дана"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Џабер ID већ у листи контаката"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Џабер ID који сте унели је већ на листи. Одаберите неки други."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6530,123 +6594,123 @@ msgstr "Име контакта"
 msgid "Set Mood"
 msgstr "Постави расположење"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Статусна порука"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Статусна порука"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Препиши статусну поруку?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ово име се већ користи. Да ли желите да препишете ову статусну поруку?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Сними као већ постављену статусну поруку"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Молимо унесите име за ову статусну поруку"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "АИМ адреса:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "ГГ Број:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ Број:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN адреса:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo! адреса:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати на налог %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Неисправан кориснички ИД"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "ИД корисника не сме садржавати ресурс."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Не можете додати себе у Вашу листу контаката."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Контакт је већ у листи"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Контакт је већ у листи контаката."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "ИД корисника:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "ГТК+ џабер клијент"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "ГТК+ верзија:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyГТК верзија:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Тренутни програмери:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Прошли програмери:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "ЗАХВАЛНИЦЕ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Последње, али не и најмање важно, желели бисмо захвалити свим одржаватељима "
 "пакета"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Б. Кокановић. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6659,88 +6723,98 @@ msgstr ""
 "\n"
 "Осветљавање лоше написаних речи неће бити у употреби"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Надимак садржи недозвољене карактере."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Захтев претплате на рачун %(account)s од %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Захтев претплате од %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Већ сте у групном разговору %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Не можете се прикључити групном разговору ако нисте повезани."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Придружите се групном разговору преко налога %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Неисправно име налога"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Налог са кога желите да уђете у собу"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Неисправан Џабер ИД групног разговора"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Ово није групни разговор"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s није име групног разговора."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Овај налог није повезан на сервер"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не можете се синхронизовати са налогом ако нисте повезани."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Синхронизуј"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започни разговор са разуном %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Започни разговор"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6749,300 +6823,300 @@ msgstr ""
 "послати поруку:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Веза није доступна"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Молимо потврдите да сте спојени на \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Није могуће разложити \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Без везе није могућа промена лозинке."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Неисправна лозинка"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Морате да унесете лозинку"
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Лозинке се не поклапају"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Лозинке уписане у оба поља морају бити идентичне."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Контакт је на вези"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Контакт је отишао са везе"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Нова Порука"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Нова Самостална Порука"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Нова Приватна Порука"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Нови Е-мејл"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Захтев за преносом датотеке"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Грешка при преносу датотеке"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Пренос датотеке завршен"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Позив на групни разговор"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Контакт променио статус"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Самостална порука користећи налог %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Самостална порука на налогу %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Самостална Порука"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Послате %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Примљене %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Форма %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s пише:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Конзола за %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Конзола"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Желио бих да Вас додам на листу мојих контаката."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr ""
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Расположен"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Џабер ИД:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Желео бих да те додам на моју листу контаката."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Листа приватности <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Редослед: %(order)s, акција: %(action)s, тип: %(type)s, вредност: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Редослед: %(order)s, акција: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Измени правило</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додај правило</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Листа приватности"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Неисправно име листе"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Морате унети име за креирање листе приватности"
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Позвани сте у групни разговор"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Вас је позвао на разговор"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Вас је позвао на групни разговор у собу %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Да ли желите да прихватите ову позивницу?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Одаберите звук"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav Звукови"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Одаберите слику"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Слике"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Кад %s постане:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавање посебног обавештења за %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Услов"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "када сам "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7053,19 +7127,19 @@ msgstr ""
 "\n"
 "Кратка Аутентикациона Ниска ове сесије је: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Већ сте потврдили идентитет овог контакта."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Идентитет контакта потврђен"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Потврдите поново..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7075,19 +7149,19 @@ msgstr ""
 "поруке или да Вам шаљу поруке, морате потврдити њихов идентитет кликајући "
 "дугме испод."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Идентитет контакта НИЈЕ потврђен"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Потврди..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Да ли сте проверили идентитет контакта?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7101,22 +7175,22 @@ msgstr ""
 "да ли и он има исту кратку Аутентикациону ниску као ви.\n"
 "Кратка Аутентикациона Ниска ове сесије: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Да ли сте разговарали са контактом и потврдили КАН?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Кључ контакта (%s) <b>не поклапа се</b> са кључем придруженим у Гајиму."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ниједан GPG кључ није додељен контакту. Не можете му слати шифроване поруке."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7125,7 +7199,7 @@ msgstr ""
 "поруке <b>не могу</b> бити шифроване. Употребите Вашег GPG клијента да дате "
 "поверење овом кључу."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7220,20 +7294,20 @@ msgstr "Опис"
 msgid "Id"
 msgstr "Идентификација"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Маркер је већ постављен"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групни разговор \"%s\" је већ маркиран."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Маркер успешно додат"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Можете управљати Вашим маркерима помоћу менија Акције из Ваше листе "
@@ -7247,15 +7321,15 @@ msgstr "Претплаћен"
 msgid "Node"
 msgstr "Чвор"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Нова објава"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Претплати се"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Укини претплату"
 
@@ -7710,31 +7784,31 @@ msgstr "Гајиму треба X сервер да би се покренуо.
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Гајиму треба pyГТК 2.8 или већа верзија"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Гајиму треба pyГТК 2.8 или већа верзија. Завршавам..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Гајиму треба pyГТК 2.8 или већа верзија"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Гајиму треба pyГТК 2.8 или већа верзија. Завршавам..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "ГТК+ нема подршку за libglade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7743,21 +7817,21 @@ msgstr ""
 "Молимо уклоните Ваш тренутни ГТК+ и инсталирајте последњу стабилну верзију "
 "са %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Молимо проверите да ГТК+ и PyГТК имају подршку за libglade на Вашем систему"
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Гајиму треба PySQLite2 за покретање"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Гајиму треба pywin32 за покретање"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7767,11 +7841,11 @@ msgstr ""
 "наћи на %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Гајим је већ покренут"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7779,35 +7853,35 @@ msgstr ""
 "Једна инстанца Гајима изгледа већ ради\n"
 "Свеједно желите покренути?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Лозинка неопходна"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Нема додељеног GPG кључа"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Повезаћете се на %s без OpenPGP кључа."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Неисправна лозинка"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Молимо поново укуцајте Вашу GPG лозинку или притисните Одустани"
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7818,59 +7892,59 @@ msgstr ""
 "регистрован од стране неког од учесника.\n"
 "Молимо одредите други надимак испод:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Прихватате ли овај захтев?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Прихватате ли овај захтев на налогу %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Ауторизација за %(url)s (ид: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Веза прекинута"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка приликом слања %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Захтев за претплатом"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Ауторизација прихваћена"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" је укинуо претплату на њега"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7878,79 +7952,79 @@ msgstr ""
 "Увек ћете га/је видети као да није на вези.\n"
 "Да ли желите да га/је уклоните са листе контаката?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Укини претплату"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Контакт са \"%s\" се не може успоставити"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s је од сада познат као %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s је тренутно %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s је поставио тему на %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Свима присутнима је дозвољено да виде ваш пун џабер ID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Соба сада приказује недоступне чланове"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "соба сада не приказује недоступне чланове"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Десила се промена у конфигурацији собе (напомена: не утиче на приватност "
 "корисника)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Логовање у соби је сада омогућено"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Логовање у соби је сада онемогућено"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Соба сада више није анонимна"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Соба је сада полу анонимна"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Соба је сада потпуно анонимна"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7958,20 +8032,25 @@ msgstr ""
 "Конфигурисали сте Гајим да користи GPG агента, али не постоји GPG агент који "
 "ради или је вратио лошу фразу лозинке.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Тренутно сте повезани без OpenPGP кључа."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Ваша лозинка није тачна"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Ваша лозинка није тачна"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG није употребљив"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7979,13 +8058,14 @@ msgid ""
 msgstr ""
 "Ниједан GPG кључ није додељен контакту. Не можете му слати шифроване поруке."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Не питај ме више"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7994,12 +8074,12 @@ msgstr ""
 "Gnome Keyring је инсталиран, али није \t\t\t\t\t\t\tправилно стартован"
 "(променљиве окружења вероватно нису \t\t\t\t\t\t\tправилно подешене)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нови е-мејл за %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8007,7 +8087,7 @@ msgstr[0] "Имате %d нови е-мејл разговор"
 msgstr[1] "Имате %d нова е-мејл разговора"
 msgstr[2] "Имате %d нових е-мејл разговора"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8022,44 +8102,44 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Вам жели послати датотеку."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Уклања контакт са листе"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Грешка при читању датотеке:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно сте примили датотеку %(filename)s од контакта %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8068,36 +8148,36 @@ msgstr ""
 "Не могу да дешифрујем поруку од контакта %s\n"
 "Можда је промењена."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Не могу да дешифрујем поруку"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Конфликт корисничког имена"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Грешка."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Конфликт ресурса"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8105,11 +8185,11 @@ msgstr ""
 "Већ сте конектовани на овај налог са истим ресурсем. Молимо Вас, откуцајте "
 "ново име ресурса"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при верификацији SSL сертификата"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8120,15 +8200,15 @@ msgstr ""
 "%(error)s\n"
 "Да ли и даље желите да се конектујете на овај сервер?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Игнориши ову грешку за овај сертификат."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Грешка SSL сертификата"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8144,11 +8224,11 @@ msgstr ""
 "\n"
 "Да ли и даље желите да се конектујете и освежите отисак овог сертификата?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Несигурна веза"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8156,11 +8236,11 @@ msgstr ""
 "Управо ћете послати лозинку преко нешифроване везе. Јесте ли сигурни да "
 "желите то да урадите?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, заиста желим да се конектујем несигурном везом"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8168,27 +8248,27 @@ msgstr ""
 "Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
 "PyOpenSSL да спречите ово. Да ли желите да наставите?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "PEP чвор није уклоњен"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP чвор %(node)s није уклоњен: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Смајлији искључени"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Ваша тема за смајлије није нађена, па су смајлији искључени."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8198,13 +8278,13 @@ msgstr ""
 "emoticons.py датотеке. Погледајте http://trac.gajim.org/wiki/Emoticons за "
 "више детаља."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Немогуће је приступити групном разговору ако сте невидљиви"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Није могуће чување Ваших подешавања"
 
@@ -8238,12 +8318,13 @@ msgstr ""
 "посебној линији"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "налог"
 
@@ -8270,9 +8351,9 @@ msgstr ""
 "једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
 "узнемиравај, невидљив"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "порука"
 
@@ -8290,22 +8371,47 @@ msgstr ""
 "\""
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Мења статус једног или више налога"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Приори_тет"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Желим да региструјем нови налог"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"измена статуса налога \"налог\". Ако није одређен, покушај промене статуса "
+"свих налога који имају укључену опцију \"синхронизација са глобалним статусом"
+"\""
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Приказује дијалог разговора како бисте могли разговарати са контактом"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "Џабер ИД контакта са којим желите разговарати"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако је назначено, контакт се узима са листе контаката овог налога"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8315,29 +8421,29 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "Џабер ИД контакта који ће примити поруку"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "садржај поруке"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp кључ"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ако је назначено, порука ће бити шифрована користећи овај јавни кључ"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "ако је назначено, порука ће бити послата користећи овај налог"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8347,135 +8453,135 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "тема поруке"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Шаље нову поруку на групни разговор коме сте се придружили."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "Џабер ИД собе која ће примити поруку"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Даје детаљне информације о контакту"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Џабер ИД контакта"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Даје детаљне информације о налогу"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Име налога"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Шаље датотеку контакту"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "датотека"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Путања до датотеке"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "ако је назначено, датотека ће бити послата коритећи овај налог"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Приказује сва подешавања и њихове вредности"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Поставља вредност 'кључа' на 'вредност'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "кључ=вредност"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'кључ' је име ставке подешавања, 'вредност' је вредност на коју ће се ставка "
 "поставити"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Брише ставку подешавања"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "кључ"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "име ставке подешавања које ће се брисати"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записује тренутно стање Гајим подешавања у .config датотеку"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Уклања контакт са листе"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Додаје контакт на листу"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "џид"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Додаје нови контакт овом рачуну"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Враћа тренутни статус (глобални ако није назначен налог)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Враћа тренутну статусну поруку (глобалну ако није назначен налог)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Враћа број непрочитаних порука"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Отвара дијалог за започињање разговора"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Започиње разговор, користећи овај налог"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Шаље кориснички дефинисан XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML за слање"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8483,72 +8589,72 @@ msgstr ""
 "Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
 "све налоге"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Управља xmpp:/ uri-јем"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI за управљање"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Налог у коме желите да управљате њиме"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "садржај поруке"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Придружи се новој соби"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "соба"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "Џабер ID собе:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "надимак"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Надимак за коришћење"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "лозинка"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Лозинка за улазак у собу"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Налог са кога желите да уђете у собу"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Молимо проверите да ли је Гајим покренут"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Приказује или скрива ipython прозор"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Недостаје аргумент \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8557,15 +8663,15 @@ msgstr ""
 "'%s' није на Вашј листи.\n"
 "Молимо одредите налог за слање поруке."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "немате активних рачуна"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Чини се да Гајим не ради. Не можете да користите gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8574,16 +8680,16 @@ msgstr ""
 "Коришћење: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s није пронађен"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8592,7 +8698,7 @@ msgstr ""
 "Коришћење: %s наредба [аргументи]\n"
 "Наредба је једна од:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8601,7 +8707,7 @@ msgstr ""
 "Превише аргумената\n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8610,7 +8716,7 @@ msgstr ""
 "Аргумент \"%(arg)s\" није наведен. \n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Лош uri"
 
@@ -8639,292 +8745,151 @@ msgstr "Не можете избрисати Вашу тренутну тему"
 msgid "Please first choose another for your current theme."
 msgstr "Молимо Вас да прво одаберете неку другу тему."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Неуспешно слање приватне поруке"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Више нисте у групном разговору \"%(room)s\" или је \"%(nick)s\" отишао."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Разговор са "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Настављени разговор"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Логовање собе је омогућено"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Нова соба је направљена"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер Вам је или доделио надимак или променио постојећи"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s је избачен: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s је избачен од стране %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s има забрану: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s има забрану од члана %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "везаност измењена"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "конфигурација собе се променила на \"само чланови\""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "гашење система"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Афилијација %(nick)s је постављена на %(affiliation)s од стране %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Афилијација %(nick)s је постављена на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Улога %(nick)s је постављена на %(role)s од стране %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Улога %(nick)s је постављена на %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s је отишао"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s се придружио групном разговору"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Надимак није пронађен: %s "
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Овај групни разговор нема тему"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Позвали сте %(contact_jid)s у собу %(room_jid)s"
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Надимак није пронађен: %s "
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Коришћење: /%s <надимак|џид> [разлог], забрањује приступ ЏИД-у у собу. "
-"Надимак учесника може бити замењен, али не и ако садржи \"@\". Ако је Џабер "
-"ИД тренутно у соби, он/она ће бити избачен(а). Размаци у именима НИСУ "
-"подржани."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr "Начин коришћења: /%s <надимак>, отвара приватни разговор са учесником."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Начин коришћења: /%s [разлог], затвара тренутни прозор или језичак, и "
-"приказује разлог ако је назначен."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Начин коришћења: /%s ЏИД> [разлог], позива Џабер ИД у тренутни групни "
-"разговор, опционо дајући разлог."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Начин коришћења: /%s <соба>@<сервер>[/надимак], нуди могућност спајања на "
-"соба@сервер користећи наведени надимак."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Начин коришћења: /%s <надимак> [разлог], уклања учесника са задатим надимком "
-"из групног разговора и опционо приказује разлог. НЕ подржава бланко знакове "
-"у надимку."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Начин коришћења: /%s <надимак> [порука], отвара прозор приватне поруке и "
-"шаље поруку учеснику са задатим надимком."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Начин коришћења: /%s <надимак>, мења Ваш надимак у тренутном групном "
-"разговору."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Начин коришћења: /%s , приказује имена учесника у групном разговору."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Начин коришћења: /%s [тема], приказује или ажурира тему групног разговора."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Начин коришћења: /%s <порука>, шаље поруку не гледајући остале команде."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Начин коришћења: /%s <надимак>, мења Ваш надимак у тренутном групном "
-"разговору."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите овај прозор, бићете искључени са овох групног разговора."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Промена Теме"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Молимо одредите нову тему:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Промена надимка"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Молимо одредите нови надимак који желите да користите:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Уништавам %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8932,22 +8897,22 @@ msgstr ""
 "Управо ћете заувек уништити ову собу.\n"
 "Можете испод написати разлог:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Можете такође унети и алтернативну локацију:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Избацујем %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Можете навести разлог испод:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Забрањујем %s"
@@ -9019,6 +8984,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Сними слику као..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Нови групни разговор"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Желео бих Вас додати на моју листу контаката"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Није могуће пронаћи дневник историјата базе података"
@@ -9103,52 +9076,62 @@ msgstr "Историјат разговора са %s"
 msgid "Disk Error"
 msgstr "Грешка при упису на диск"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s је тренутно %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Порука грешке: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Грешка."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус је тренутно: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус је тренутно: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Истекло време за учитавање слике"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Слика је превелика"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Нисте повезани на сервер"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Да ли заиста желите да избришете означену поруку?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Групни разговори"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Приватни Разговори"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Поруке"
 
@@ -9209,18 +9192,18 @@ msgstr "_Игнориши"
 msgid "Retrieving profile..."
 msgstr "Дохватање профила..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Датотека је празна"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Датотека не постоји"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Не могу учитати слику"
 
@@ -9252,46 +9235,46 @@ msgstr ""
 "Настала је грешка приликом објављивања Ваших личних информација, покушајте "
 "поново касније."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Спојени налози"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Ауторизација послата"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Сада ће контакт \"%s\" знати Ваш статус."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Захтев за претплатом послат"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако контакт \"%s\" прихвати овај захтев, знаћете његов/њен статус."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Ауторизација уклоњена"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Сада ће Вас контакт \"%s\" увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG није употребљив"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Учествујете у једном или више групних разговора"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9299,28 +9282,28 @@ msgstr ""
 "Промена Вашег статуса у Невидљив ће резултовати  одвезивањем са тих групних "
 "разговора. Јесте ли сигурни да желите ићи на невидљиво?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "десинхронизован"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Имате непрочитаних порука"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9328,16 +9311,16 @@ msgstr ""
 "Поруке ће бити доступне за читање и касније ако имате омогућен историјат и "
 "тај контакт у листи."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Морате их прочитати пре уклањања овог транспорта."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" ће бити уклоњен"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9345,11 +9328,11 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са овог "
 "транспорта."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Транспорт ће бити уклоњен"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9358,57 +9341,69 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са ових "
 "транспорта: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Преименуј контакт"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Унесите нови надимак за контакт %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Преименуј групу"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Унесите ново име за групу %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Уклони групу"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Желите ли уклонити групу %s са листе контаката?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Уједно уклоња и све контакте из ове групе из листе контаката"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Придружи OpenPGP Кључ"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Одаберите кључ за придруживање контакту"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" ће бити уклоњен са Ваше листе контаката"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9417,11 +9412,11 @@ msgstr ""
 "особа увек видети као да нисте на вези."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Да ли желите да наставите?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9429,16 +9424,16 @@ msgstr ""
 "Уклањањем овог контакта уједно подразумевано уклањате и одобрење што значи "
 "да ће Вас та особа увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Желим да овај контакт зна мој статус и након уклањања"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти ће бити уклоњени са Ваше листе контаката"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9448,21 +9443,35 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Нема доступних налога"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Морате креирати налог пре него што можете да разговарате са осталим "
 "контактима."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9470,13 +9479,13 @@ msgstr ""
 "Ваш сервер не подржава чување информација псеудоконтаката. Те информације "
 "неће бити сачуване при следећем повезивању."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9486,11 +9495,11 @@ msgstr ""
 "Генерално, они се користе када иста особа има неколико Џабер налога или "
 "транспортних налога."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Неисправан URI датотеке:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9498,12 +9507,12 @@ msgstr[0] "Да ли желите послати ову датотеку кон�
 msgstr[1] "Да ли желите послати ове датотеке контакту %s:"
 msgstr[2] "Да ли желите послати ове датотеке контакту %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Послате %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Шаље датотеку контакту"
@@ -9513,115 +9522,127 @@ msgstr "Шаље датотеку контакту"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "користећи рачун %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "на %s налог"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "користећи %s рачун"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Управљање _маркерима..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "налога %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "за налог %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Измени статусну поруку"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Објави песму"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Конфигуриши сервисе..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Увећај све"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "П_ошаљи групну поруку"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Свим корисницима"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Свим корисницима на вези"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Желео бих Вас додати на моју листу контаката"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Управљање контактима"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Измени _групе"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Пошаљи једну поруку"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Изврши наредбу..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Управљање транспортима"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Измени транспорт"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Преименуј"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Увећај"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Излогуј се"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Нови групни разговор"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Излогуј се"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Управник историјатом"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Придруживање новом групном разговору"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Промени статусну поруку..."
 
@@ -9638,20 +9659,20 @@ msgstr "Грешка у примању форме за податке"
 msgid "No result"
 msgstr "Нема резултата"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Грешка при упису на диск"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Потврди ове опције сесије"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9666,7 +9687,7 @@ msgstr ""
 "\n"
 "\tДа ли су ове ставке прихватљиве?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9862,6 +9883,137 @@ msgstr "Нема захтева за претплатом на чекању."
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Додај посеб_но обавештење"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Придружи Open_PGP Кључ"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Команда није подржана за zeroconf  налог."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Команда: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Начин коришћења: /%s, празни текстуални прозор"
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Начин коришћења: /%s, сакрива дугмад."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Начин коришћења: /%(command)s <action>, шаље акцију тренутном групном "
+#~ "разговору. Користититреће лице. (нпр. /%(command)s је експлодирао.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Начин коришћења: /%s, шаље пинк контакту"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Начин коришћења: /%s, шаље поруку контакту"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Нема информација ни помоћи за /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Омогући локалну везу/zeroconf поруке"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Надимак није пронађен: %s "
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Овај групни разговор нема тему"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Позвали сте %(contact_jid)s у собу %(room_jid)s"
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Надимак није пронађен: %s "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Коришћење: /%s <надимак|џид> [разлог], забрањује приступ ЏИД-у у собу. "
+#~ "Надимак учесника може бити замењен, али не и ако садржи \"@\". Ако је "
+#~ "Џабер ИД тренутно у соби, он/она ће бити избачен(а). Размаци у именима "
+#~ "НИСУ подржани."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Начин коришћења: /%s <надимак>, отвара приватни разговор са учесником."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Начин коришћења: /%s [разлог], затвара тренутни прозор или језичак, и "
+#~ "приказује разлог ако је назначен."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Начин коришћења: /%s ЏИД> [разлог], позива Џабер ИД у тренутни групни "
+#~ "разговор, опционо дајући разлог."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Начин коришћења: /%s <соба>@<сервер>[/надимак], нуди могућност спајања на "
+#~ "соба@сервер користећи наведени надимак."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Начин коришћења: /%s <надимак> [разлог], уклања учесника са задатим "
+#~ "надимком из групног разговора и опционо приказује разлог. НЕ подржава "
+#~ "бланко знакове у надимку."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Начин коришћења: /%s <надимак> [порука], отвара прозор приватне поруке и "
+#~ "шаље поруку учеснику са задатим надимком."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Начин коришћења: /%s <надимак>, мења Ваш надимак у тренутном групном "
+#~ "разговору."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr ""
+#~ "Начин коришћења: /%s , приказује имена учесника у групном разговору."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Начин коришћења: /%s [тема], приказује или ажурира тему групног разговора."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Начин коришћења: /%s <порука>, шаље поруку не гледајући остале команде."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Начин коришћења: /%s <надимак>, мења Ваш надимак у тренутном групном "
+#~ "разговору."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Кликните да видите могућности (као што су MSN, ICQ транспорти) џабер "
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 9516d6899..0ffb9d1c2 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-20 00:05+0200\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
@@ -216,6 +216,7 @@ msgstr "<b>Lične informacije</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Nalog"
 
@@ -282,8 +283,8 @@ msgstr "Izmeni lične informacije"
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -294,8 +295,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Opšte"
 
@@ -355,25 +356,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacije o Vama, kako su uskladištene na serveru"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Nije odabran nijedan ključ"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ništa"
 
@@ -529,8 +526,8 @@ msgstr ""
 "Mogli biste uzeti u obzir i mogućnost izmene podešavanja firewall-a."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Džaber ID:"
 
@@ -544,7 +541,7 @@ msgid "Mer_ge accounts"
 msgstr "_Spoji naloge"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Prei_menuj"
 
@@ -806,7 +803,7 @@ msgid "All statuses"
 msgstr "Svi statusi"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Odsutan"
 
@@ -823,7 +820,7 @@ msgid "Have "
 msgstr "Imam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -832,7 +829,7 @@ msgid "Launch a command"
 msgstr "Pokrenite komandu"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Nedostupan"
 
@@ -1017,7 +1014,7 @@ msgid "Join _Group Chat"
 msgstr "Priključi se _grupnom razgovoru"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Dodaj na listu kontakata..."
 
@@ -1043,39 +1040,6 @@ msgstr "_Otvori vezu u internet pregledaču"
 msgid "_Start Chat"
 msgstr "_Započni razgovor"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Pozovi kontakte"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Pošalji _datoteku"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Uključi/isključi enkripciju s kraja na kraj"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Uključi/isključi Open_PGP enkripciju"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Dodaj na listu kontakata"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Istorijat"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "Pozo_vi"
@@ -1100,6 +1064,119 @@ msgstr ""
 "Započećete grupni razgovor.\n"
 "Odaberite kontakte koje želite da pozovete"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Traži njegov/njen status"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Dodaj poseb_no obaveštenje..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Pridruži Open_PGP Ključ..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Izvrši naredbu..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Izmeni _grupe..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "Pozo_vi u"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Pozovi kontakte"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "_Ukloni"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Pošalji korisnički definisan status"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Pošalji jednu _poruku..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Pošalji _datoteku..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Postavi korisnički definisan avatar..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Započni ra_zgovor"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Uključi/isključi enkripciju s kraja na kraj"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Uključi/isključi Open_PGP enkripciju"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Dozvoli mu/joj da vidi moj status"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Blokiraj"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Zabrani mu/joj da vidi moj status"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Istorijat"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignoriši"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Upravljanje kontaktima"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "_Preimenuj..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Pretplata"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Odblokiraj"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Poništi ignrisanje"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Popunite formular."
@@ -1216,7 +1293,7 @@ msgstr ""
 "Red kontakata\n"
 "Baner razgovora"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Podebljano"
 
@@ -1240,7 +1317,7 @@ msgstr "Otišao"
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Kurziv"
 
@@ -1312,6 +1389,14 @@ msgstr "Mo_derator"
 msgid "Occupant Actions"
 msgstr "_Akcije prisutnih"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Pošalji _datoteku"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Dodaj na listu kontakata"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1320,13 +1405,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Zabrani"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Blokiraj"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Izbaci"
@@ -1343,13 +1421,6 @@ msgstr "_Vlasnik"
 msgid "_Send Private Message"
 msgstr "_Pošalji privatnu poruku"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Odblokiraj"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Glas"
@@ -1358,7 +1429,7 @@ msgstr "_Glas"
 msgid "Create new post"
 msgstr "Napravi novu objavu"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Od"
 
@@ -1383,8 +1454,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Dobrodošli u Gajimov menadžer dnevnika istorijata</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Obriši"
 
@@ -1437,34 +1508,39 @@ msgstr "Pretraga:"
 msgid "_Log conversation history"
 msgstr "_Pamti u dnevniku istorijat razgovora"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "_Markiraj ovu sobu (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Pridruži se grupnom razgovoru"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Uđi u ovu sobu automatski kada se povežem"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Nadimak:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Nedavno:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Pridruži se"
@@ -1494,7 +1570,7 @@ msgstr "Umanji prozor na auto povezivanje"
 msgid "Print status:"
 msgstr "Ispis statusa:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2032,7 +2108,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sortiraj kontakte po statusu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2199,34 +2275,39 @@ msgid "All"
 msgstr "Svi"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "sve prema pretplati"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Dozvoli"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Odbij"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "Džaber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Lista privatnosti"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "sve prema pretplati"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "sve u grupi"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2238,19 +2319,19 @@ msgstr ""
 "od\n"
 "za"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "da mi šalje poruke"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "da mi šalje upite"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "da mi pošalje status"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "da vidi moj status"
 
@@ -2418,96 +2499,11 @@ msgstr "Ukloni nalog i iz Gajima i sa servera"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "Traži njegov/njen status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Dodaj poseb_no obaveštenje..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Pridruži Open_PGP Ključ..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Izmeni _grupe..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Izvrši naredbu..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "Pozo_vi u"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "_Ukloni"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Pošalji korisnički definisan status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Pošalji jednu _poruku..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Pošalji _datoteku..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Postavi korisnički definisan avatar..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Započni ra_zgovor"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Dozvoli mu/joj da vidi moj status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Zabrani mu/joj da vidi moj status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignoriši"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Upravljanje kontaktima"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "_Preimenuj..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Pretplata"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Poništi ignrisanje"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2629,7 +2625,7 @@ msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "Informacije"
 
@@ -2842,26 +2838,6 @@ msgstr "_Poruka"
 msgid "_Presence"
 msgstr "_Prisutnost"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Dodaj poseb_no obaveštenje"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Pridruži Open_PGP Ključ"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Izmeni _grupe"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "_Preimenuj"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Izmeni nalog..."
@@ -2905,48 +2881,48 @@ msgid "Service returned an error."
 msgstr "Servis je vratio grešku."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Aktivirano"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Deaktivirano"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Da/Ne"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Ceo broj"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Boja"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Ime postavke"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Vrednost"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Tip"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(ništa)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Skriven"
 
@@ -2960,188 +2936,187 @@ msgstr "Primili ste novi unos:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Engleski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Beloruski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Bretanski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Češki"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Nemački"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Britanski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Španski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Baskijski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Francuski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italijanski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Norveški (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Holandski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brazilski portugalski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Srpski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovački"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Švedski"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Jezik za pravopis"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Vaša poruka ne može biti poslata ako niste povezani."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "Nedefinisan"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "Bolestan"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informacije kontakta"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Stvarno pošalji datoteku?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Ako pošaljete datoteku kontaktu %s, on/ona će znati Vaš pravi džaber ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Nije na listi kontakata"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Lista prenosa aktivnih, završenih i zaustavljenih datoteka"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Nepoznat izvođač"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Nepoznat naslov"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Nepoznat izvor"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3150,17 +3125,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "iz <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Nema dodeljenog GPG ključa"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3168,50 +3143,50 @@ msgstr ""
 "Nijedan GPG ključ nije dodaljen ovom kontaktu. Ne možete šifrovati poruke sa "
 "GPG-om."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti pamćena"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti pamćena"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "i autentifikovani"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "i NEautentifikovani"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3220,91 +3195,48 @@ msgstr ""
 "%(type)s šifrovanje %(status)s aktivan %(authenticated)s.\n"
 "Vaša sesija razgovora %(logged)s biti pamćena."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Komanda nije podržana za zeroconf  nalog."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Komanda: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Način korišćenja: /%s, prazni tekstualni prozor"
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Način korišćenja: /%s, sakriva dugmad."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Način korišćenja: /%(command)s <action>, šalje akciju trenutnom grupnom "
-"razgovoru. Koristititreće lice. (npr. /%(command)s je eksplodirao.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Način korišćenja: /%s, šalje pink kontaktu"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Nema informacija ni pomoći za /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Uspostavljanje sesije prekinuto"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Ova sesija je šifrovana"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr "i BIĆE pamćena"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti pamćena"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Identitet drugog korisnika nije potvrđen. Kliknite na štit za više detalja."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Sledeća poruka NIJE bila šifrovana"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Sledeća poruka je bila šifrovana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3312,15 +3244,15 @@ msgstr ""
 "Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
 "će biti izgubljena."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3329,7 +3261,7 @@ msgstr ""
 "Datoteka baze podataka (%s) se ne može čitati. Pokušajte da je popravite ili "
 "uklonite (sav istorijat poruka će biti izgubljen)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je sada %(status)s"
@@ -3338,23 +3270,23 @@ msgstr "%(name)s je sada %(status)s"
 msgid "creating logs database"
 msgstr "kreiram bazu dnevnika"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je datoteka, ali bi trebala biti fascikla"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim će se sada završiti"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je fascikla, ali bi trebala biti datoteka"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram fasciklu %s"
@@ -3418,9 +3350,9 @@ msgstr "Odaberite grupne razgovore koje želite da napustite"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Grupni razgovori"
 
@@ -3436,73 +3368,114 @@ msgstr "Prosledi nepročitane poruke"
 msgid "All unread messages have been forwarded."
 msgstr "Sve nepročitane poruke su prosleđene."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Koristi DBus i demon obaveštenja za prikazivanje obaveštenja"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Vreme u minutama, nakom koga će se Vaš status promeiti u Odsutan."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Odsutan, kao posledica mirovanja više od $T min.)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S će biti zamenjeno sa trenutnom statusnom porukom,$T sa vremenom "
 "odsutnosti."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Vreme u minutama, nakom koga će se Vaš status promeiti u Nije dostupan."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nije dostupan, kao posledica mirovanja više od $T min.)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S će biti zamenjeno sa trenutnom statusnom porukom,$T sa vremenom "
 "nedostupnosti"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Neispravan nadimak"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "tekst statusne poruke"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Neispravan nadimak"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Promena nadimka"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "tekst statusne poruke"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (odvojena blanko znakovima) redova (naloga i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "podrazumevano"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Omogući lokalnu vezu/zeroconf poruke"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Jezik koji koristi pravopis"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3512,7 +3485,7 @@ msgstr ""
 "'ponekad' - ispisuj vreme svakih print_ichat_every_foo_minutes minuta.\n"
 "'nikad' - nikad ne ispisuj vreme."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3523,18 +3496,18 @@ msgstr ""
 "najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje_vremena "
 "postavnjeno na 'ponekad'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Smatraj * / _ parove kao znakove za formatiranje."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ako je istinito, ne uklanjaj */_ . Tako će *abv* biti podebljano, ali "
 "iokruženo sa * *."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3545,7 +3518,7 @@ msgstr ""
 "ref/rst/restructuredtext.html (Ako želite da koristite ovo, instalirajte "
 "docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3553,7 +3526,7 @@ msgstr ""
 "Karakter za dodavanje posle nadimka kada se koristi dovršavanje nadimka "
 "(tasterom tab) u grupnom razgovoru"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3561,7 +3534,7 @@ msgstr ""
 "Karakter koji želite dodati posle željenog nadimka ukoliko je željeni "
 "nadimak u grupnom razgovoru već upotrebljen"
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3572,19 +3545,19 @@ msgstr ""
 "dokumentaciju za strftime, za punu dokumentaciju: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Karakteri koji će biti prikazani pre nadimka u razgovoru"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Karakteri koji će biti prikazani posle nadimka u razgovoru"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Dodaj * i [n] u naslov liste kontakata?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3592,11 +3565,25 @@ msgstr ""
 "Koliko linija prethodnog razgovora pamtiti kada se prozor/jezičak  za "
 "razgovor ponovo otvori."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Koliko minuta da traju linije prethodnog razgovora."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3604,11 +3591,11 @@ msgstr ""
 "Pošalji poruku sa Ctrl+Enter, a sa Enter pravi novu liniju. (Podrazumevano "
 "ponašanje Miralabisovog ICQ klijenta)"
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koliko linija sačuvati sa Ctrl+KeyUP"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3617,11 +3604,11 @@ msgstr ""
 "Ili Vaš specificirani URL sa %s u njemu gde je %s reč ili fraza ili 'VIKI-"
 "REČNIK' što znači korišćenje viki-rečnika."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ako je označeno, Gajim se može kontrolisati korišćenjem gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3632,14 +3619,14 @@ msgstr ""
 "računa (ako nemaju listen_to_network_manager postavljen na neistinito i "
 "sinhronizuj sa globalnim statusom) u zavisnosti od statusa mrežne konekcije."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Poslata obaveštenja o stanju razgovora. Može biti jedno od "
 "'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3647,7 +3634,7 @@ msgstr ""
 "Prikazana obaveštenja o stanju razgovora u prozoru za razgovor. Može biti "
 "jedno od 'svi', 'samo_sastavljanje', 'onemogućeno'."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3655,11 +3642,11 @@ msgstr ""
 "Ako se ne ispisuje vreme za svaku poruku (print_time==ponekad), ispisati ga "
 "svakih x minuta"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj pre zatvaranja prozora/jezička grupnog razgovora."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3667,7 +3654,7 @@ msgstr ""
 "Uvek pitaj pre zatvaranja jezička/prozora kada je u pitanju ova lista "
 "odvojena blanko karakterima džaber ID-ova grupnih razgovora."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3675,13 +3662,13 @@ msgstr ""
 "Nikad ne pitaj pre zatvaranja jezička/prozora grupnog razgovora kada je u "
 "pitanju ova listaodovojena blanko znacima džaber ID-ova grupnih razgovora."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3689,27 +3676,27 @@ msgstr ""
 "Lista hostova odvojena zarezima, koju šaljemo, uz lokalne interefejse, za "
 "transfer datoteka, u slučaju prosleđivanja porta/NATovanja."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard definiše KiB = 1024 bajtova, KB = 1000 bajtova"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Obavesti me o svim događajima u ikoni sistemske kasete."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži jezičak iako je samo jedan razgovor?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaši granicu sveske u prozorima razgovora?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Prikaši dugme za zatvaranje u jezičku?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3720,18 +3707,18 @@ msgstr ""
 "prioritet, odvojeni zarezima. Validne grupe su 1, 2, 5, 14, 15, 16, 17 i 18. "
 "Višlji brojevi su sugurniji, ali tada treba više vremena za početak sesije."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista reči odvojena blanko karakterima koje će biti obojene u grupnim "
 "razgovorima"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3739,14 +3726,14 @@ msgstr ""
 "Ako je istinito, Gajim se završava kada se pritisne X dugme. Ovo podešavanje "
 "se koristi samo ako je ikona sistemske kasete u upotrebi."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ako je istinito, Gajim proverava da li je podrazumevani džaber klijent na "
 "svakom startovanju."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3754,7 +3741,7 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati ikonu na svakom jezičku koji sadrži "
 "nepročitane poruke. U zavisnosti od teme, ikona može biti i animirana."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3762,12 +3749,12 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati statusnu poruku (ako nije prazna) za "
 "svaki kontakt u listi kontakata"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definišite poziciju avatara u listi kontakata. Može biti levo ili desno"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3775,7 +3762,7 @@ msgstr ""
 "Ako je istinito, Gajim će poslati upit za avatar za svaki kontakt koji "
 "prošlog puta nije  imao avatar ili je onaj u memoriji prestar"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3783,7 +3770,7 @@ msgstr ""
 "Ako je neistinito, više nećete videti statusnu porukuu razgovorima kada "
 "kontakt promeni svoj status i/ili statusnu poruku."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3797,30 +3784,30 @@ msgstr ""
 "sve statusne poruke. Ako je \"in_and_out\". Gajim će prikazivati samo poruke "
 "tipa taj i taj je ušao/izašao u/iz sobe."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Boja pozadine kontakta kada tek dođu na vezu."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Boja pozadine kontakta kada tek odu sa veze."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ako je istinito, vraćene poruke iz istorijata će biti manjeg fonta od "
 "podrazumevanog."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u sistemskoj kaseti."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3830,7 +3817,7 @@ msgstr ""
 "prozor bljeska (podrazumevano ponašanje u većini menadžera prozora) pri "
 "novim događajima."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3841,7 +3828,7 @@ msgstr ""
 "u grupnim razgovorima"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3860,31 +3847,31 @@ msgstr ""
 "'pertype' - Poruke istog tipa (npr., razgovori i grupni razgovori) se šalju "
 "u isti prozor."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ako nije istinito, nećete više videti avatar u prozoru razgovora."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ako je istinito, pritisak na taster 'esc' zatvara jezičak/prozor."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Sakriva dugmad u prozorima razgovora."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Sakriva baner u prozoru grupnog razgovora."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Sakriva baner u prozoru razgovora dve osobe"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Sakriva listu učesnika u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3892,15 +3879,15 @@ msgstr ""
 "U razgovoru, prikaži nadimak na početku novog reda samo kada se ne radi o "
 "istoj osobi koja je pričala i u prošloj poruci."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Uvlačenje pri korišćenju spajanja uzastopnih nadimaka."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Glatko skrolovanje u prozoru razgovora"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3908,11 +3895,11 @@ msgstr ""
 "Lista boja odvojena sa \":\" koje će biti korišćene za bojenje nadimaka u "
 "grupnim razgovorima."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab ide na sledeći jezičak kada nema nepročitanih jezičaka"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3920,7 +3907,25 @@ msgstr ""
 "Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazan niz znači "
 "da nikada ne prikazujemo upit."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazan niz znači "
+"da nikada ne prikazujemo upit."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazan niz znači "
+"da nikada ne prikazujemo upit."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3930,7 +3935,7 @@ msgstr ""
 "nalog u prozoru za izmenu podešavanja naloga. BUDITE OPREZNI, kada ste "
 "povezani sa negativnim prioritetom NEĆETE primati nikakve poruke od servera."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3938,7 +3943,7 @@ msgstr ""
 "Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3947,7 +3952,7 @@ msgstr ""
 "Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3955,7 +3960,7 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati ukupan broj korisnika i broj korinsika "
 "na vezi u grupnim redovima."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3963,7 +3968,7 @@ msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretira sve dolazne "
 "poruke kao poruke postavljenog tipa"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3971,7 +3976,7 @@ msgstr ""
 "Ako je istinito, Gajim će skrolovati i označiti kontakt koji Vam je "
 "poslednji poslao poruku, ako prozor razgovora nije otvoren."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3979,11 +3984,11 @@ msgstr ""
 "Ako je istinito, Gajim će konvertovati sve karakter između $$ i $$ u sliku "
 "koristeći dvips u ibaciti je u prozor razgovora."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Vreme neaktivnosti posle koga se prozor za izmenu statusa zatvara."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3991,7 +3996,7 @@ msgstr ""
 "Maksimum poruka koje se prikazuju u razogovoru. Najstarije linije se "
 "sklanjaju."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3999,18 +4004,18 @@ msgstr ""
 "Ako je istinito, prozor obaveštenja od servisa obaveštenja će biti zakačen "
 "za sistemsku kasetu."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Odaberite interval između dve provere da se ništa ne dešava na računaru."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr "Promenite vrednost da promenite veličinu Lateks formula. Više je veće."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4019,13 +4024,23 @@ msgstr ""
 "Ispravne uri šeme. Samo šeme sa ove liste će biti prihvaćene kao \"stvarne\" "
 "uri."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4033,7 +4048,7 @@ msgstr ""
 "Prioritet će se automatski promeniti u zavisnosti od Vašeg statusa. "
 "Prioriteti su definsani u autopriority_* podešavanjima."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4042,26 +4057,37 @@ msgstr ""
 "dnd, invisible. PAŽNjA: ova opcija se koristi samo ako je "
 "restore_last_status  onemogućena."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Ako je omogućeno, postavi poslednji korišćeni status."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Ako nije istinito, nećete više videti avatar u prozoru razgovora."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ako je onemogućeno, ne potpisuj prisustvo sa GPG ključem, čak iako je GPG "
 "konfigurisan."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Omogući ESessions enkripciju za ovaj nalog."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Da li će Gajim automatski startovati šifrovanu sesiju ako je moguće?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4069,29 +4095,29 @@ msgstr ""
 "Uređena lista (odvojena zarezima) tipova konekcije za probu. Može sadržati "
 "tls, ssl ili plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Prikaži prozor upozorenja pre korišćenja standardne SSL biblioteke."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista ssl grešaka za ignorisanje, odvojena razmacima."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4101,11 +4127,11 @@ msgstr ""
 "ponovno uspostavljanje veze."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 privremeno rešenje"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4113,15 +4139,15 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti Vašu IP adresu u proksi koji je "
 "difinisan u file_transfer_proxies podešavanjima za prenos."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtev primanja"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Poslati zahtev primanja"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4129,11 +4155,11 @@ msgstr ""
 "Kada se uspostavlja šifrovana sesija, da li Gajim treba da pretpostavi da "
 "želite da čuvate poruke u dnevniku?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4141,101 +4167,101 @@ msgstr ""
 "Da li Gajim treba automatski da započne šifrovanu vezu sa ovim kontaktom "
 "kada je moguće?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik u kome želite proveravati neispravno napisane reči"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "sve ili razmakom odvojen status"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'da', 'ne', ili 'oboje'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'da', 'ne' ili ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Vraćam se brzo"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite poruku."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Radim."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Napolju"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Napolju sam, uživam u životu."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Ne smetaj."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4244,99 +4270,99 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
 "nadimak."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitavanje modula idle"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Loš host"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Nevalidna lokalna adresa? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informacije o registraciji za transport %s nisu došle na vreme"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Registruj se na %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "Veza prekinuta"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Nalog %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4346,77 +4372,84 @@ msgstr ""
 "(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili  uklonite (sav "
 "istorijat poruka će biti izgubljen)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nedozvoljen nadimak: %s "
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Grupni razgovor.%s ne postoji."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Morate koristiti Vaš registrovani nadimak u grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Soba grupnog razgovora je uništena"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Možete se priključiti sobi %s umesto ove"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Želeo bih da te dodam na moju listu kontakata."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sada ste pretplaćeni na %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zahtev za ukidanje pretplate od kontakta %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sada Vam je ukinuta pretplata od kontakta %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4426,219 +4459,205 @@ msgstr ""
 "kontakata. Upotrebite alate kao što je http://jru.jabberstudio.org/ da biste "
 "ga uklonili"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Lozinka za OpenPGP nije uneta"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Povezaćete se na %s bez OpenPGP ključa."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Nisam uspeo da uzmem sertifikat izdavača"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Nisam uspeo da uzmem CRL sertifikata"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nisam uspeo da dešifrujem potpis sertifikata"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nisam uspeo da dešifrujem CRL sertifikata"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Nisam uspeo da dekodiram javni ključ izdavača"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu sertifikata"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Greška u CRL sertifikata"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Sertifikat još nije validan"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Sertifikat je istekao"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "CRL nije još validan"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Greška u formatu sertifakovog polja od kada je validan"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Greška u formatu sertifakovog polja do kada je validan"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja poslednjeg ažuriranja"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja sledećeg ažuriranja"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Nemam više memorije"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Samopotpisani sertifikat u lancu sertifikata"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "U nemogućnosti da uzmem sertifikat lokalnog izdavača"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "U nemogućnosti da verifikujem prvi sertifikat"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Lanac sertifikata predugačak"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Sertifikat povučen"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Neispravan sertifikat sertifikacionog tela (CA)"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Prekoračena dužina putanje"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha sertifikata"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Sertifikatu se ne veruje"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Sertifikat odbačen"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Pogrešna tema izdavača sertifikata"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Identifikator ključa autorizatora i teme se ne poklapaju"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Serijski broj autorizatora i izdavača se ne poklapaju"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Izgubljena veza sa računom \"%s\""
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Ponovo se povežite ručno."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s je loše odgovorio na zahtev registracije:: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s je ponudio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Neispravan odgovor"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s je loše odgovorio na zahtev registracije: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Veza sa \"%s\" nije moguća"
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Sačuvano u: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Veza sa %s nije moguća"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Izgubljena veza sa nalogom %s. Pokušajte ponovo da se konektujete."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentičnost sertifikata %s može biti neispravna."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4647,7 +4666,7 @@ msgstr ""
 "\n"
 "SSL greška: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4656,24 +4675,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentikacija sa \"%s\" neuspešna"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Molimo Vas da proverite Vaše korisničko ime i lozinku od grešaka."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom uklanjanja lista privatnosti"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4682,30 +4701,30 @@ msgstr ""
 "Lista privatnosti %s nije uklonjena. Možda je aktivna u nekom od Vaših "
 "resursa na vezi. Deaktivirajte je tamo i pokušajte ponovo."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Nije moguće poslati praznu datoteku"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Niti je udaljeno prisustvo potpisano, niti je ključ dodeljen."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "Ključ kontakta (%s) ne poklapa se sa ključem pridruženim u Gajimu."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *šifrovana* (Pogledajte :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4714,30 +4733,40 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Pozovi kontakte"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Veza prekinuta"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Posmatrači"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Prenosi"
 
@@ -4746,14 +4775,19 @@ msgid "Not in roster"
 msgstr "Nije u listi kontakata"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Na ovom računaru nedostaju python vezivanja za D-Bus"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogućnosti Gajima se ne mogu koristiti"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
@@ -4829,56 +4863,69 @@ msgid "eleven"
 msgstr "jedanaest"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s sati"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s i pet"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s i deset"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s i petnaest"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s i dvadeset"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s i dvadeset i pet"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s i trideset minuta"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "dvadeset i pet do %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "dvadeset do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "petnaest minuta do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "deset do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "pet do %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s sati"
 
@@ -4946,190 +4993,190 @@ msgstr "Neispravan karakter u imenu hosta."
 msgid "Invalid character in resource."
 msgstr "Neispravan karakter u resursu."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Dostupan"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Nije na vezi"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Nije na vezi"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Postoje greške"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Trenutna pretplata:Nijedna"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za pretplatu):Nijedna"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Učesnici"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Učesnik"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Posetilac"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Član"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "sluša konverzaciju"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "piše poruku..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "pauza pri pisanju poruke"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5137,22 +5184,22 @@ msgstr[0] "%d poruka čeka"
 msgstr[1] "%d poruka čekaju"
 msgstr[2] "%d poruka čeka"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " iz sobe %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " od korisnika %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5160,12 +5207,12 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaj na čekanju"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Greška prilikom izvršavanja \"%(command)s\": %(error)s"
@@ -5181,11 +5228,11 @@ msgstr "%s nije ispravan nivo logovanja"
 msgid "error: cannot open %s for reading"
 msgstr "greška: ne mogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "prebacujem bazu dnevnika u indekse"
 
@@ -5836,14 +5883,14 @@ msgstr ""
 "Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti prekinut."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 "[Ovo je deo šifrovane sesije. Ukoliko vidite ovo, nešto je pošlo naopako.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5852,17 +5899,29 @@ msgstr ""
 "Host %s koji ste postavili kao ft_add_host_to_send napredno podešavanje nije "
 "ispravan. pa je ignorisan."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Lozinka za OpenPGP nije uneta"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Povezaćete se na %s bez OpenPGP ključa."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Ako želite nastaviti sa slanjem i primanjem poruka, morate se isključiti i "
 "ponovo doći na vezu."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5871,31 +5930,31 @@ msgstr ""
 "%s\n"
 "Poruke lokalne mreže možda neće raditi kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalni servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ne mogu se povezati na port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Molimo proverite da li je avahi-demon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nije moguće promeniti status računa \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5903,20 +5962,20 @@ msgstr ""
 "Niste spojeni ili ste nevidljivi za druge. Vaša poruka ne može biti poslata."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Ova poruka je šifrovana]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Vaša poruka nije mogla biti poslata."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt nije na vezi. Vašu poruku nije moguće poslati."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5928,24 +5987,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja servisa. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Podrazumevana poruka"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Omogućen"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Rečnik za jezik %s nije dostupan"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5954,211 +6013,217 @@ msgstr ""
 "Morate instalirati %s rečnik kako biste mogli koristiti proveru pravopisa, "
 "ili odaberite drugi jezik postavkom speller_language opcije."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Otići sa veze i povezati se odmah?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ako želite da se sve promene trenutno primene, morate da se ponovo povežete."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računaru"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju pre uklanjanja naloga."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
 "nastavite?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na server"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promenu imena naloga, morate otići sa veze."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Da biste promenili ime naloga, morate prvo pročitati sve događaje na čekanju."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Ime Naloga Već U Upotrebi"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ovo ime već koristi jedan od Vaših naloga. Molimo Vas, odaberite drugo ime."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Neispravno ime naloga"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Ime naloga ne može biti prazno."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Ime naloga ne može da sadrži beline."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Preimenuj nalog"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za nalog%s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Džaber ID mora biti oblika \"korisnik@server\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Vaš port mora biti broj porta."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Neuspelo uzimanje tajnih ključeva"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Došlo je do problema u uzimanju Vaših OpenPGP tajnih ključeva."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite Vaš OpenPGP ključ"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Nije dostupan takav nalog"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napraviti Vaš nalog pre izmena ličnih informacija."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Niste povezani na server"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez veze sa serverom, nije moguća izmena ličnih informacija."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš server ne podržava Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Vaš server ne može da sačuva Vaše lične informacije."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "Za promenu imena naloga, morate otići sa veze."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Račun lokal već postoji."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Molimo Vas, preimenujte ili uklonite pre omogućavanja lokalnih poruka."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Izmeni %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registruj se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Lista zabrana"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Lista članova"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Lista vlasnika"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Lista administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "DžID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Zabrana..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6166,11 +6231,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Dodavanje člana..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6178,11 +6243,11 @@ msgstr ""
 "<b>Koga želite da postavite članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Dodavanje vlasnika..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6190,11 +6255,11 @@ msgstr ""
 "<b>Koga želite da postavite za vlasnika?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Dodavanje administratora..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6202,7 +6267,7 @@ msgstr ""
 "<b>Koga želite da postavite za administratora?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6219,124 +6284,123 @@ msgstr ""
 "4. domen (samo se domen poklapa, kao i bilo koji korisnik@domen,\n"
 "domen/resurs, ili adresa koja sadrži poddomen."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje računa %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Lozinka zahtevana"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?ispis statusa:Sve"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Samo ući i napustiti"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Novi grupni razgovor"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Ovaj marker ima neispravne podatke"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Molimo obavezno ispunite polja servera i sobe ili uklonite ovaj marker."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Nedozvoljen nadimak: %s "
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Neispravan server"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Nalog je uspešno dodat"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Možete postaviti napredna podešavanja naloga pritiskom na dugme Napredno, "
 "ili kasnije, klikom na stavku menija Nalozi pod menijem Uredi iz glavnog "
 "prozora."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi nalog je uspešno napravljen"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo odredite server na kome želite da se registrujete."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Sertifikat je već u datoteci"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Sertifikat je već u datoteci %s, pa nije ponovo dodat."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6351,7 +6415,7 @@ msgstr ""
 "SSL greška: %(error)s\n"
 "Da li i dalje želite da se povežete na ovaj server?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6362,63 +6426,63 @@ msgstr ""
 "SHA1 otisak ovog sertifikata:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri kreiranju naloga"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Ime naloga je već upotrebljeno"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Već imate nalog sa tim imenom."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "događaj"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Primljena Prva Poruka"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Sledeća Primljena Poruka Fokusirana"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Sledeća Primljena Poruka Nefokusirana"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakt Na Vezi"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakt Otišao Sa Veze"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Poruka Poslata"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Primljen Gmail e-mejl"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6428,7 +6492,7 @@ msgstr ""
 "stigla na drugi kraj. Ako ova ikona ostane ovako \n"
 "dugo vremena, verovatno je da se poruka izgubila."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6436,74 +6500,74 @@ msgstr ""
 "Tekst ispod ove linije je ono što je rečeno od kada ste poslednji put\n"
 "obratili pažnju na ovaj grupni razgovor"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "_Izlaz"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za nalog \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Vikipediji"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Potraži u Rečniku"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL-u Rečnika nedostaje \"%s\" i nije Viki rečnik"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Veb pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Pretraži Veb"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Otvori kao _Vezu"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Juče"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "Pre %i dana"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Džaber ID već u listi kontakata"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Džaber ID koji ste uneli je već na listi. Odaberite neki drugi."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6538,123 +6602,123 @@ msgstr "Ime kontakta"
 msgid "Set Mood"
 msgstr "Postavi raspoloženje"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna poruka"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Statusna poruka"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Prepiši statusnu poruku?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ovo ime se već koristi. Da li želite da prepišete ovu statusnu poruku?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Snimi kao već postavljenu statusnu poruku"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati na nalog %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Neispravan korisnički ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne sme sadržavati resurs."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Ne možete dodati sebe u Vašu listu kontakata."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakt je već u listi"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Kontakt je već u listi kontakata."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "ID korisnika:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "GTK+ džaber klijent"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ verzija:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK verzija:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Trenutni programeri:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Prošli programeri:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "ZAHVALNICE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Poslednje, ali ne i najmanje važno, želeli bismo zahvaliti svim "
 "održavateljima paketa"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6667,88 +6731,98 @@ msgstr ""
 "\n"
 "Osvetljavanje loše napisanih reči neće biti u upotrebi"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zahtev pretplate na račun %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtev pretplate od %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se priključiti grupnom razgovoru ako niste povezani."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružite se grupnom razgovoru preko naloga %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Neispravno ime naloga"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Nalog sa koga želite da uđete u sobu"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Džaber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Ovaj nalog nije povezan na server"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete se sinhronizovati sa nalogom ako niste povezani."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započni razgovor sa razunom %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Započni razgovor"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6757,300 +6831,300 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće razložiti \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promena lozinke."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Morate da unesete lozinku"
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt je na vezi"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt je otišao sa veze"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nova Samostalna Poruka"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Novi E-mejl"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Greška pri prenosu datoteke"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Poziv na grupni razgovor"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt promenio status"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Samostalna poruka koristeći nalog %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Samostalna poruka na nalogu %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Samostalna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Poslate %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Forma %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML Konzola"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Želio bih da Vas dodam na listu mojih kontakata."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr ""
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Raspoložen"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Džaber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Grupa"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Želeo bih da te dodam na moju listu kontakata."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Redosled: %(order)s, akcija: %(action)s, tip: %(type)s, vrednost: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosled: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmeni pravilo</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Neispravno ime liste"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate uneti ime za kreiranje liste privatnosti"
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vas je pozvao na razgovor"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vas je pozvao na grupni razgovor u sobu %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Da li želite da prihvatite ovu pozivnicu?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Odaberite zvuk"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Odaberite sliku"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje posebnog obaveštenja za %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Uslov"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7061,19 +7135,19 @@ msgstr ""
 "\n"
 "Kratka Autentikaciona Niska ove sesije je: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Identitet kontakta potvrđen"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Potvrdite ponovo..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7083,19 +7157,19 @@ msgstr ""
 "poruke ili da Vam šalju poruke, morate potvrditi njihov identitet klikajući "
 "dugme ispod."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Identitet kontakta NIJE potvrđen"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Da li ste proverili identitet kontakta?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7109,23 +7183,23 @@ msgstr ""
 "da li i on ima istu kratku Autentikacionu nisku kao vi.\n"
 "Kratka Autentikaciona Niska ove sesije: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Da li ste razgovarali sa kontaktom i potvrdili KAN?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Ključ kontakta (%s) <b>ne poklapa se</b> sa ključem pridruženim u Gajimu."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nijedan GPG ključ nije dodeljen kontaktu. Ne možete mu slati šifrovane "
 "poruke."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7134,7 +7208,7 @@ msgstr ""
 "da poruke <b>ne mogu</b> biti šifrovane. Upotrebite Vašeg GPG klijenta da "
 "date poverenje ovom ključu."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7229,20 +7303,20 @@ msgstr "Opis"
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Marker je već postavljen"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Grupni razgovor \"%s\" je već markiran."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Marker uspešno dodat"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Možete upravljati Vašim markerima pomoću menija Akcije iz Vaše liste "
@@ -7256,15 +7330,15 @@ msgstr "Pretplaćen"
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Pretplati se"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
@@ -7719,31 +7793,31 @@ msgstr "Gajimu treba X server da bi se pokrenuo. Završavam..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajimu treba pyGTK 2.8 ili veća verzija"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajimu treba pyGTK 2.8 ili veća verzija. Završavam..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajimu treba pyGTK 2.8 ili veća verzija"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajimu treba pyGTK 2.8 ili veća verzija. Završavam..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ nema podršku za libglade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7752,21 +7826,21 @@ msgstr ""
 "Molimo uklonite Vaš trenutni GTK+ i instalirajte poslednju stabilnu verziju "
 "sa %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Molimo proverite da GTK+ i PyGTK imaju podršku za libglade na Vašem sistemu"
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajimu treba PySQLite2 za pokretanje"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajimu treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7776,11 +7850,11 @@ msgstr ""
 "naći na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7788,35 +7862,35 @@ msgstr ""
 "Jedna instanca Gajima izgleda već radi\n"
 "Svejedno želite pokrenuti?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Lozinka neophodna"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Nema dodeljenog GPG ključa"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Povezaćete se na %s bez OpenPGP ključa."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Neispravna lozinka"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7827,59 +7901,59 @@ msgstr ""
 "registrovan od strane nekog od učesnika.\n"
 "Molimo odredite drugi nadimak ispod:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Prihvatate li ovaj zahtev?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Veza prekinuta"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Zahtev za pretplatom"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" je prihvatio da vidite njegov/njen status."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7887,79 +7961,79 @@ msgstr ""
 "Uvek ćete ga/je videti kao da nije na vezi.\n"
 "Da li želite da ga/je uklonite sa liste kontakata?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Ukini pretplatu"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s je postavio temu na %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Soba sada prikazuje nedostupne članove"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "soba sada ne prikazuje nedostupne članove"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Desila se promena u konfiguraciji sobe (napomena: ne utiče na privatnost "
 "korisnika)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Logovanje u sobi je sada omogućeno"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Logovanje u sobi je sada onemogućeno"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Soba sada više nije anonimna"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada polu anonimna"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Soba je sada potpuno anonimna"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Lozinka potrebna za pridruživanje grupnom razgovoru %s. Unesite je."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7967,20 +8041,25 @@ msgstr ""
 "Konfigurisali ste Gajim da koristi GPG agenta, ali ne postoji GPG agent koji "
 "radi ili je vratio lošu frazu lozinke.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste povezani bez OpenPGP ključa."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije tačna"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Vaša lozinka nije tačna"
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7989,13 +8068,14 @@ msgstr ""
 "Nijedan GPG ključ nije dodeljen kontaktu. Ne možete mu slati šifrovane "
 "poruke."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -8004,12 +8084,12 @@ msgstr ""
 "Gnome Keyring je instaliran, ali nije \t\t\t\t\t\t\tpravilno startovan"
 "(promenljive okruženja verovatno nisu \t\t\t\t\t\t\tpravilno podešene)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi e-mejl za %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8017,7 +8097,7 @@ msgstr[0] "Imate %d novi e-mejl razgovor"
 msgstr[1] "Imate %d nova e-mejl razgovora"
 msgstr[2] "Imate %d novih e-mejl razgovora"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8032,44 +8112,44 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Uspešno ste primili datoteku %(filename)s od kontakta %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspešno ste poslali datoteku %(filename)s za kontakt %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8078,36 +8158,36 @@ msgstr ""
 "Ne mogu da dešifrujem poruku od kontakta %s\n"
 "Možda je promenjena."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Ne mogu da dešifrujem poruku"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Greška."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Konflikt resursa"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8115,11 +8195,11 @@ msgstr ""
 "Već ste konektovani na ovaj nalog sa istim resursem. Molimo Vas, otkucajte "
 "novo ime resursa"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Greška pri verifikaciji SSL sertifikata"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8130,15 +8210,15 @@ msgstr ""
 "servera:%(error)s\n"
 "Da li i dalje želite da se konektujete na ovaj server?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Greška SSL sertifikata"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8154,11 +8234,11 @@ msgstr ""
 "\n"
 "Da li i dalje želite da se konektujete i osvežite otisak ovog sertifikata?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Nesigurna veza"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8166,11 +8246,11 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nešifrovane veze. Jeste li sigurni da "
 "želite to da uradite?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8178,27 +8258,27 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
 "PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije uklonjen"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP čvor %(node)s nije uklonjen: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Smajliji isključeni"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Vaša tema za smajlije nije nađena, pa su smajliji isključeni."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8208,13 +8288,13 @@ msgstr ""
 "emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/Emoticons za "
 "više detalja."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemoguće je pristupiti grupnom razgovoru ako ste nevidljivi"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
@@ -8248,12 +8328,13 @@ msgstr ""
 "posebnoj liniji"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "nalog"
 
@@ -8280,9 +8361,9 @@ msgstr ""
 "jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
 "uznemiravaj, nevidljiv"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "poruka"
 
@@ -8300,22 +8381,47 @@ msgstr ""
 "statusom\""
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Menja status jednog ili više naloga"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_tet"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Želim da registrujem novi nalog"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"izmena statusa naloga \"nalog\". Ako nije određen, pokušaj promene statusa "
+"svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
+"statusom\""
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Prikazuje dijalog razgovora kako biste mogli razgovarati sa kontaktom"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "Džaber ID kontakta sa kojim želite razgovarati"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je naznačeno, kontakt se uzima sa liste kontakata ovog naloga"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8325,29 +8431,29 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "Džaber ID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp ključ"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je naznačeno, poruka će biti šifrovana koristeći ovaj javni ključ"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je naznačeno, poruka će biti poslata koristeći ovaj nalog"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8357,135 +8463,135 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku na grupni razgovor kome ste se pridružili."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "Džaber ID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "Džaber ID kontakta"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o nalogu"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Ime naloga"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Šalje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Putanja do datoteke"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "ako je naznačeno, datoteka će biti poslata koriteći ovaj nalog"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Prikazuje sva podešavanja i njihove vrednosti"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrednost 'ključa' na 'vrednost'."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ključ=vrednost"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ključ' je ime stavke podešavanja, 'vrednost' je vrednost na koju će se "
 "stavka postaviti"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Briše stavku podešavanja"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "ime stavke podešavanja koje će se brisati"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim podešavanja u .config datoteku"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "džid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Dodaje novi kontakt ovom računu"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ako nije naznačen nalog)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvara dijalog za započinjanje razgovora"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Započinje razgovor, koristeći ovaj nalog"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Šalje korisnički definisan XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8493,72 +8599,72 @@ msgstr ""
 "Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
 "sve naloge"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Upravlja xmpp:/ uri-jem"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI za upravljanje"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Nalog u kome želite da upravljate njime"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Pridruži se novoj sobi"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "soba"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "Džaber ID sobe:"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Nadimak za korišćenje"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Lozinka za ulazak u sobu"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Nalog sa koga želite da uđete u sobu"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Molimo proverite da li je Gajim pokrenut"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8567,15 +8673,15 @@ msgstr ""
 "'%s' nije na Vašj listi.\n"
 "Molimo odredite nalog za slanje poruke."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Čini se da Gajim ne radi. Ne možete da koristite gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8584,16 +8690,16 @@ msgstr ""
 "Korišćenje: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8602,7 +8708,7 @@ msgstr ""
 "Korišćenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8611,7 +8717,7 @@ msgstr ""
 "Previše argumenata\n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8620,7 +8726,7 @@ msgstr ""
 "Argument \"%(arg)s\" nije naveden. \n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Loš uri"
 
@@ -8649,294 +8755,152 @@ msgstr "Ne možete izbrisati Vašu trenutnu temu"
 msgid "Please first choose another for your current theme."
 msgstr "Molimo Vas da prvo odaberete neku drugu temu."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Više niste u grupnom razgovoru \"%(room)s\" ili je \"%(nick)s\" otišao."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Razgovor sa "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Logovanje sobe je omogućeno"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Nova soba je napravljena"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Server Vam je ili dodelio nadimak ili promenio postojeći"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranu: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranu od člana %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "vezanost izmenjena"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe se promenila na \"samo članovi\""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "gašenje sistema"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Afilijacija %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Afilijacija %(nick)s je postavljena na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s je otišao"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Nadimak nije pronađen: %s "
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Ovaj grupni razgovor nema temu"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Pozvali ste %(contact_jid)s u sobu %(room_jid)s"
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Nadimak nije pronađen: %s "
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Korišćenje: /%s <nadimak|džid> [razlog], zabranjuje pristup DžID-u u sobu. "
-"Nadimak učesnika može biti zamenjen, ali ne i ako sadrži \"@\". Ako je "
-"Džaber ID trenutno u sobi, on/ona će biti izbačen(a). Razmaci u imenima NISU "
-"podržani."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Način korišćenja: /%s [razlog], zatvara trenutni prozor ili jezičak, i "
-"prikazuje razlog ako je naznačen."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Način korišćenja: /%s DžID> [razlog], poziva Džaber ID u trenutni grupni "
-"razgovor, opciono dajući razlog."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Način korišćenja: /%s <soba>@<server>[/nadimak], nudi mogućnost spajanja na "
-"soba@server koristeći navedeni nadimak."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Način korišćenja: /%s <nadimak> [razlog], uklanja učesnika sa zadatim "
-"nadimkom iz grupnog razgovora i opciono prikazuje razlog. NE podržava blanko "
-"znakove u nadimku."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Način korišćenja: /%s <nadimak> [poruka], otvara prozor privatne poruke i "
-"šalje poruku učesniku sa zadatim nadimkom."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Način korišćenja: /%s <nadimak>, menja Vaš nadimak u trenutnom grupnom "
-"razgovoru."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Način korišćenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Način korišćenja: /%s [tema], prikazuje ili ažurira temu grupnog razgovora."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Način korišćenja: /%s <poruka>, šalje poruku ne gledajući ostale komande."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Način korišćenja: /%s <nadimak>, menja Vaš nadimak u trenutnom grupnom "
-"razgovoru."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Ako zatvorite ovaj prozor, bićete isključeni sa ovoh grupnog razgovora."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Promena Teme"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Molimo odredite novu temu:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Promena nadimka"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molimo odredite novi nadimak koji želite da koristite:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8944,22 +8908,22 @@ msgstr ""
 "Upravo ćete zauvek uništiti ovu sobu.\n"
 "Možete ispod napisati razlog:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Možete navesti razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem %s"
@@ -9031,6 +8995,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Snimi sliku kao..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Novi grupni razgovor"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Želeo bih Vas dodati na moju listu kontakata"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći dnevnik istorijata baze podataka"
@@ -9115,52 +9087,62 @@ msgstr "Istorijat razgovora sa %s"
 msgid "Disk Error"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Poruka greške: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Greška."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status je trenutno: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Isteklo vreme za učitavanje slike"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Niste povezani na server"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Da li zaista želite da izbrišete označenu poruku?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Grupni razgovori"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Poruke"
 
@@ -9221,18 +9203,18 @@ msgstr "_Ignoriši"
 msgid "Retrieving profile..."
 msgstr "Dohvatanje profila..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
@@ -9264,46 +9246,46 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
 "ponovo kasnije."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Autorizacija poslata"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ako kontakt \"%s\" prihvati ovaj zahtev, znaćete njegov/njen status."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Autorizacija uklonjena"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će Vas kontakt \"%s\" uvek videti kao da niste na vezi."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Učestvujete u jednom ili više grupnih razgovora"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9311,28 +9293,28 @@ msgstr ""
 "Promena Vašeg statusa u Nevidljiv će rezultovati  odvezivanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "desinhronizovan"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Imate nepročitanih poruka"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9340,16 +9322,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat i "
 "taj kontakt u listi."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" će biti uklonjen"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9357,11 +9339,11 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transport će biti uklonjen"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9370,57 +9352,69 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovih "
 "transporta: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Preimenuj kontakt"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno uklonja i sve kontakte iz ove grupe iz liste kontakata"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Pridruži OpenPGP Ključ"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za pridruživanje kontaktu"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" će biti uklonjen sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9429,11 +9423,11 @@ msgstr ""
 "ta osoba uvek videti kao da niste na vezi."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Da li želite da nastavite?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9441,16 +9435,16 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno podrazumevano uklanjate i odobrenje što "
 "znači da će Vas ta osoba uvek videti kao da niste na vezi."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status i nakon uklanjanja"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9460,21 +9454,35 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate kreirati nalog pre nego što možete da razgovarate sa ostalim "
 "kontaktima."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9482,13 +9490,13 @@ msgstr ""
 "Vaš server ne podržava čuvanje informacija pseudokontakata. Te informacije "
 "neće biti sačuvane pri sledećem povezivanju."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9498,11 +9506,11 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9510,12 +9518,12 @@ msgstr[0] "Da li želite poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Da li želite poslati ove datoteke kontaktu %s:"
 msgstr[2] "Da li želite poslati ove datoteke kontaktu %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Poslate %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Šalje datoteku kontaktu"
@@ -9525,115 +9533,127 @@ msgstr "Šalje datoteku kontaktu"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "na %s nalog"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje _markerima..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "naloga %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "za nalog %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Konfiguriši servise..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Želeo bih Vas dodati na moju listu kontakata"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Izmeni _grupe"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Pošalji jednu poruku"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Izvrši naredbu..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Upravljanje transportima"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "_Preimenuj"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Izloguj se"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Novi grupni razgovor"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Izloguj se"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Pridruživanje novom grupnom razgovoru"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Promeni statusnu poruku..."
 
@@ -9650,20 +9670,20 @@ msgstr "Greška u primanju forme za podatke"
 msgid "No result"
 msgstr "Nema rezultata"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Potvrdi ove opcije sesije"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9678,7 +9698,7 @@ msgstr ""
 "\n"
 "\tDa li su ove stavke prihvatljive?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9874,6 +9894,138 @@ msgstr "Nema zahteva za pretplatom na čekanju."
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Dodaj poseb_no obaveštenje"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Pridruži Open_PGP Ključ"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Komanda nije podržana za zeroconf  nalog."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Komanda: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Način korišćenja: /%s, prazni tekstualni prozor"
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Način korišćenja: /%s, sakriva dugmad."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Način korišćenja: /%(command)s <action>, šalje akciju trenutnom grupnom "
+#~ "razgovoru. Koristititreće lice. (npr. /%(command)s je eksplodirao.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Način korišćenja: /%s, šalje pink kontaktu"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Nema informacija ni pomoći za /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Omogući lokalnu vezu/zeroconf poruke"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Nadimak nije pronađen: %s "
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Ovaj grupni razgovor nema temu"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Pozvali ste %(contact_jid)s u sobu %(room_jid)s"
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Nadimak nije pronađen: %s "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Korišćenje: /%s <nadimak|džid> [razlog], zabranjuje pristup DžID-u u "
+#~ "sobu. Nadimak učesnika može biti zamenjen, ali ne i ako sadrži \"@\". Ako "
+#~ "je Džaber ID trenutno u sobi, on/ona će biti izbačen(a). Razmaci u "
+#~ "imenima NISU podržani."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Način korišćenja: /%s [razlog], zatvara trenutni prozor ili jezičak, i "
+#~ "prikazuje razlog ako je naznačen."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Način korišćenja: /%s DžID> [razlog], poziva Džaber ID u trenutni grupni "
+#~ "razgovor, opciono dajući razlog."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Način korišćenja: /%s <soba>@<server>[/nadimak], nudi mogućnost spajanja "
+#~ "na soba@server koristeći navedeni nadimak."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Način korišćenja: /%s <nadimak> [razlog], uklanja učesnika sa zadatim "
+#~ "nadimkom iz grupnog razgovora i opciono prikazuje razlog. NE podržava "
+#~ "blanko znakove u nadimku."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Način korišćenja: /%s <nadimak> [poruka], otvara prozor privatne poruke i "
+#~ "šalje poruku učesniku sa zadatim nadimkom."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Način korišćenja: /%s <nadimak>, menja Vaš nadimak u trenutnom grupnom "
+#~ "razgovoru."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr ""
+#~ "Način korišćenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Način korišćenja: /%s [tema], prikazuje ili ažurira temu grupnog "
+#~ "razgovora."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Način korišćenja: /%s <poruka>, šalje poruku ne gledajući ostale komande."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Način korišćenja: /%s <nadimak>, menja Vaš nadimak u trenutnom grupnom "
+#~ "razgovoru."
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Kliknite da vidite mogućnosti (kao što su MSN, ICQ transporti) džaber "
diff --git a/po/sv.po b/po/sv.po
index d14c2f2b4..36e17c92f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-20 00:05+0200\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -214,6 +214,7 @@ msgstr "<b>Personlig information</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Konto"
 
@@ -281,8 +282,8 @@ msgstr "Redigera personlig information..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -293,8 +294,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Allmänt"
 
@@ -354,25 +355,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Information om dig, som den är sparad på servern"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Ingen"
 
@@ -528,8 +525,8 @@ msgstr ""
 "Du kan dock överväga att ändra möjliga brandväggsregler."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
@@ -543,7 +540,7 @@ msgid "Mer_ge accounts"
 msgstr "Sa_mmanfoga konton"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Byt _namn"
 
@@ -796,7 +793,7 @@ msgid "All statuses"
 msgstr "Alla statusar"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Frånvarande"
 
@@ -813,7 +810,7 @@ msgid "Have "
 msgstr "Har "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Osynlig"
 
@@ -822,7 +819,7 @@ msgid "Launch a command"
 msgstr "Kör ett kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
@@ -1008,7 +1005,7 @@ msgid "Join _Group Chat"
 msgstr "Gå in i _gruppchatt"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Lägg till i kontaktlista..."
 
@@ -1034,39 +1031,6 @@ msgstr "_Öppna länk i webbläsare"
 msgid "_Start Chat"
 msgstr "_Starta chatt"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Bjud in _kontakter"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Skicka _fil"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Växla användarkryptering"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Växla Open_PGP-kryptering"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Lägg till i kontaktlista"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Historik"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "Bjud _in"
@@ -1091,6 +1055,119 @@ msgstr ""
 "Du är på väg att påbörja en fleranvändarchatt.\n"
 "Välj kontakterna som du vill bjuda in"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "_Be om att få se hans/hennes status"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Lägg till speciell _notifiering..."
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Tilldela Open_PGP-nyckel..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Kör kommando..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Redigera _grupper..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "Bjud _in till"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Bjud in _kontakter"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "Ta _bort"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Skicka a_npassad status"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Skicka ett _meddelande"
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Skicka _fil..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Ställ in anpassad _avatar..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Starta _chatt"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Växla användarkryptering"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Växla Open_PGP-kryptering"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Tillåt henne/honom att se min status"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Blockera"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Förbjud henne/honom att se min status"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Historik"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ignorera"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "_Hantera kontakt"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "Byt _namn..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Prenumeration"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "A_vblockera"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "A_vignorera"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Fyll i formuläret."
@@ -1209,7 +1286,7 @@ msgstr ""
 "Kontaktrad\n"
 "Chattbanner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Fet"
 
@@ -1233,7 +1310,7 @@ msgstr "Borta"
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1305,6 +1382,14 @@ msgstr "Mo_derator"
 msgid "Occupant Actions"
 msgstr ""
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Skicka _fil"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Lägg till i kontaktlista"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
@@ -1313,13 +1398,6 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Bannlys"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Blockera"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "Sparka _ut"
@@ -1336,13 +1414,6 @@ msgstr "_Ägare"
 msgid "_Send Private Message"
 msgstr "_Skicka privat meddelande"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "A_vblockera"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Röst"
@@ -1351,7 +1422,7 @@ msgstr "_Röst"
 msgid "Create new post"
 msgstr "Skapa ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Från"
 
@@ -1379,8 +1450,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Välkommen till Gajims hanterare för historikloggar</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1433,34 +1504,39 @@ msgstr "Sök:"
 msgid "_Log conversation history"
 msgstr "_Logga konversationshistorik"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Bokmärk detta rum (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Gå in i gruppchatt"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Gå in detta rum automatiskt när jag ansluter"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Senaste:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Gå in i"
@@ -1489,7 +1565,7 @@ msgstr "Minimera när du gått in automatiskt"
 msgid "Print status:"
 msgstr "Skriv ut status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Server:"
 
@@ -2023,7 +2099,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sortera kontakter efter status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Status"
 
@@ -2184,34 +2260,39 @@ msgid "All"
 msgstr "Alla"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "alla efter prenumeration"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Tillåt"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Neka"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Ordning:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Integritetslista"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "alla efter prenumeration"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "alla i gruppen"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2223,19 +2304,19 @@ msgstr ""
 "från\n"
 "till"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "att skicka mig meddelanden"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "att skicka mig frågor"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "att skicka mig status"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "att se min status"
 
@@ -2403,96 +2484,11 @@ msgstr "Ta bort kontot från Gajim och från _servern"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "Ta _bort"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "_Be om att få se hans/hennes status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Lägg till speciell _notifiering..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Tilldela Open_PGP-nyckel..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Redigera _grupper..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Kör kommando..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "Bjud _in till"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "Ta _bort"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Skicka a_npassad status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Skicka ett _meddelande"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Skicka _fil..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Ställ in anpassad _avatar..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Starta _chatt"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Tillåt henne/honom att se min status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Förbjud henne/honom att se min status"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ignorera"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "_Hantera kontakt"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "Byt _namn..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Prenumeration"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "A_vignorera"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2613,7 +2609,7 @@ msgid "_Add contact"
 msgstr "_Lägg till kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Information"
 
@@ -2828,26 +2824,6 @@ msgstr "_Meddelande"
 msgid "_Presence"
 msgstr "_Närvaro"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Lägg till speciell _notifiering"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Tilldela Open_PGP-nyckel"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Redigera _grupper"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "Byt _namn"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Redigera konto..."
@@ -2891,48 +2867,48 @@ msgid "Service returned an error."
 msgstr "Tjänsten returnerade ett fel."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Aktiverad"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Inaktiverad"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Boolesk"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Heltal"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Färg"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Inställningens namn"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Värde"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Dold"
 
@@ -2946,186 +2922,185 @@ msgstr ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "engelska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "vitryska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "bulgariska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "bretonska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "tjeckiska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "tyska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "grekiska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "brittiska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "spanska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "baskiska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "franska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "kroatiska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "italienska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "norska (bokmål)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "nederländska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "norska (nynorsk)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "polska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "portugisiska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "brasiliansk portugisiska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "ryska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "serbiska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "slovakiska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "svenska"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "kinesiska"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Stavningsspråk"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "En anslutning är inte tillgänglig"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Ditt meddelande kan inte skickas förrän du är ansluten."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 msgid "Underline"
 msgstr "Understruken"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 msgid "Strike"
 msgstr "Genomstruken"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr "Typsnitt"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 msgid "Clear formating"
 msgstr "Ingen formatering"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Verkligen skicka filen?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Om du skickar en fil till %s så kommer han/hon att få veta ditt riktiga "
 "Jabber-ID."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "GPG-kryptering aktiverad"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Inte i kontaktlista"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "En lista över aktiva, färdigställda och stoppade filöverföringar"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Okänd artist"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Okänd titel"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Okänd källa"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3134,17 +3109,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> av <i>%(artist)s</i>\n"
 "från <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s från gruppchatten %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Ingen GPG-nyckel tilldelad"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3152,50 +3127,50 @@ msgstr ""
 "Ingen GPG-nyckel har tilldelats denna kontakt. Därför kan du inte kryptera "
 "meddelanden med GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "GPG-kryptering inaktiverad"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Sessionen KOMMER att loggas"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Sessionen KOMMER INTE att loggas"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "är"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "är INTE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "kommer"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "kommer INTE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "och autentiserad"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "och INTE autentiserad"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3204,66 +3179,23 @@ msgstr ""
 "%(type)s-kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din chattsession %(logged)s att loggas."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Kommandot stöds inte för zeroconf-konto."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Kommandon: %s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Användning: /%s, tömmer textfönstret."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Användning: /%s, döljer chattknapparna."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Användning: /%(command)s <åtgärd>, skickar åtgärd till aktuell gruppchatt. "
-"Använd tredje person. (t.ex. /%(command)s exploderar.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Användning: /%s, skickar en ping till kontakten"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Användning: /%s, skickar meddelandet till kontakten"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Ingen hjälp för /%s"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Sessionsförhandlingen avbröts"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Denna session är krypterad"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " och KOMMER att loggas"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " och KOMMER INTE att loggas"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3271,25 +3203,25 @@ msgstr ""
 "Fjärrkontaktens identitet har inte verifierats. Klicka på sköldknappen för "
 "mer information."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "E2E-kryptering inaktiverad"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Följande meddelande var INTE krypterat"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Följande meddelande var krypterat"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du tog just emot ett meddelande från \"%s\""
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3297,15 +3229,15 @@ msgstr ""
 "Om du stänger den här fliken och har historik inaktiverad så kommer "
 "meddelandet att förloras."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Databasfel"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3314,7 +3246,7 @@ msgstr ""
 "Databasfilen (%s) kan inte läsas. Försök att reparera den eller ta bort den "
 "(all historik kommer att förloras)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s är nu %(status)s"
@@ -3323,23 +3255,23 @@ msgstr "%(name)s är nu %(status)s"
 msgid "creating logs database"
 msgstr "skapar loggdatabas"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s är en fil men den borde vara en katalog"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim kommer nu att avslutas"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s är en katalog men den borde vara en fil"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "skapar katalogen %s"
@@ -3403,9 +3335,9 @@ msgstr "Välj de gruppchattar som du vill lämna"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Gruppchattar"
 
@@ -3421,68 +3353,109 @@ msgstr "Vidarebefordra olästa meddelanden"
 msgid "All unread messages have been forwarded."
 msgstr "Alla olästa meddelanden har vidarebefordrats."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr "Spela upp ljud när användaren är upptagen"
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Använd D-Bus och Notification-Daemon för att visa meddelanden"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 "Visa endast kontakter som är anslutna och lediga för chatt i kontaktlistan."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minuter efter vilken din status ändras till frånvarande."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Frånvarande på grund av overksam i mer än $T min)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minuter efter vilken din status ändras till inte tillgänglig."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Inte tillgänglig på grund av overksam i mer än $T min)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Ogiltigt smeknamn"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "text för statusmeddelande"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Ogiltigt smeknamn"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Byter Smeknamn"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "text för statusmeddelande"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "standard"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Aktivera link-local-/zeroconf-meddelanden"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Språk som används för stavningskontroll"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3492,32 +3465,32 @@ msgstr ""
 "\"ibland\" - skriv ut tid var print_ichat_every_foo_minutes minut.\n"
 "\"aldrig\" - skriv aldrig ut tid."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandla par av * / _ som möjliga formateringstecken."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Om sant så tas inte */_ bort. Så *abc* blir i fet stil men * * / / _ _ tas "
 "inte bort."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3525,7 +3498,7 @@ msgstr ""
 "Tecken att lägga till efter smeknamnet när smeknamnskomplettering används "
 "(tabb) i gruppchatt."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3533,7 +3506,7 @@ msgstr ""
 "Tecken att föreslå för att läggas till efter önskat smeknamn när önskat "
 "smeknamn används av någon annan i gruppchatten."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3544,19 +3517,19 @@ msgstr ""
 "\". Läs python-manualen för strftime för fullständig dokumentation: http://"
 "docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tecken som skrivs ut före smeknamnet i konversationer"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tecken som skrivs ut efter smeknamnet i konversationer"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Lägg till * och [n] i kontaktlistans titel?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3564,13 +3537,27 @@ msgstr ""
 "Hur många rader som skall kommas ihåg från tidigare konversation när en "
 "chattflik/chattfönster öppnas igen."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hur många minuter skall de sista raderna från tidigare konversation finnas "
 "kvar."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3578,11 +3565,11 @@ msgstr ""
 "Skicka meddelande med Ctrl+Enter och gör radbrytning med Enter (ICQ-klienten "
 "Mirabilis standardbeteende)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hur många rader skall sparas för Ctrl+KeyUP."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3591,11 +3578,11 @@ msgstr ""
 "Antingen en anpassad url med %s, där %s är ordet/frasen eller \"WIKTIONARY\" "
 "vilket betyder att wiktionary skall användas."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Om kryssad så kan Gajim fjärrstyras med gajim-remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 #, fuzzy
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
@@ -3607,28 +3594,28 @@ msgstr ""
 "för konton (om de nu inte har listen_to_network_manager satt till False och "
 "dem synkar med global status) baserat på om nätverkets status."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
@@ -3637,7 +3624,7 @@ msgstr ""
 "Fråga alltid innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
@@ -3646,13 +3633,13 @@ msgstr ""
 "Fråga aldrig innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3661,29 +3648,29 @@ msgstr ""
 "Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
 "port forwarding."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-standarden säger: KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 #, fuzzy
 msgid "Notify of events in the system trayicon."
 msgstr "Notifiera om händelser in systemets statusikon."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Visa flik när endast en konversation är aktiv?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Visa flikkant om endast en konversation är aktiv?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Visa stängningsknapp i flik?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3691,18 +3678,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Chattstatusmeddelanden:"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3710,13 +3697,13 @@ msgstr ""
 "Om sant så avslutas Gajim när fönsterhanterarens X-knapp klickas. Denna "
 "inställning behandlas endast när aktivitetsfältsikonen används."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Om True registreras Gajim för xmpp:// vid varje uppstart."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3724,7 +3711,7 @@ msgstr ""
 "Om sant kommer Gajim att visa en ikon på varje flik som innehåller olästa "
 "meddelanden. Beroende på temat så kan denna ikon vara animerad."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -3733,11 +3720,11 @@ msgstr ""
 "Om True kommer Gajim att visa statusmeddelande, om inte tomt, för varje "
 "kontakt under dess namn i registerfönstret"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3746,7 +3733,7 @@ msgstr ""
 "avatar senaste gången, eller som har en mellanlagrad avatar som är för "
 "gammal."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3755,7 +3742,7 @@ msgstr ""
 "Om False kommer du inte längre att se en statusrad i chattfönstret när en "
 "kontakt byter hans eller hennes status och/eller statusmeddelande."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3764,28 +3751,28 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Bakgrundsfärg på kontakter när de precis loggat in."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrundsfärg på kontakter när de precis loggat ut."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Visa inte avatar för själva transporten."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Visa inte kontaktlista i systemets fönsterlista."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3795,7 +3782,7 @@ msgstr ""
 "fönstret att blinka (standardbeteendet i de flesta fönsterhanterare) när det "
 "finns väntande händelser."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -3807,7 +3794,7 @@ msgstr ""
 "SHA-info i gruppchattnärvaroinformation"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3827,33 +3814,33 @@ msgstr ""
 "visas i ett specifikt fönster. OBS: Gajim måste startas om för att denna "
 "inställning skall börja gälla."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Of False kommer du inte längre att se avatarer i chattfönstret"
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Om True kommer escape att stänga en tabb eller ett fönster"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Döljer knapparna i chattfönster."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Döljer bannern i ett gruppchattfönster"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Döljer bannern i chattfönster för två personer"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Döljer deltagarlistan i gruppchattfönster."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3861,16 +3848,16 @@ msgstr ""
 "Visa endast smeknamnet, i en chatt, vid början av en rad om det inte är "
 "samma person som pratar som i förra meddelandet."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Skicka meddelande och stäng fönster"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3878,166 +3865,199 @@ msgid ""
 msgstr ""
 "Lista på färger som kommer användas för att färga smeknamnet i gruppchattar.<"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl+Tabb går till nästa skrivflik när ingen är oläst."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:258
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "Of False kommer du inte längre att se avatarer i chattfönstret"
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktivera ESessions-kryptering för detta konto."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Ska Gajim automatiskt starta en krypterad session när det är möjligt?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Visa en varningsdialog innan standard-SSL-biblioteket används."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Temporär lösning för Jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4045,25 +4065,25 @@ msgstr ""
 "Om kryssad så kommer Gajim att använda ditt IP och proxyservrar definerade i "
 "alternativet file_transfer_proxies för filöverföringar."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Är OpenPGP aktiverat för denna kontakt?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4071,101 +4091,101 @@ msgstr ""
 "Ska Gajim automatiskt starta en krypterad session med denna kontakt om "
 "möjligt?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Språket för vilket vi vill leta efter felstavade ord"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "alla eller mellanslagsseparerad status"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "\"yes\", \"no\" eller \"both\""
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "\"yes\", \"no\" eller \"\""
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Äter"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, lämna ett meddelande."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Arbetar"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Jag är tillgänglig."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Jag är ledig för chatt."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Strax tillbaka."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Jag är inte tillgänglig."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Stör inte."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Hejdå!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4174,59 +4194,59 @@ msgstr ""
 "Ljud att spela när MUC-meddelande innehåller ett av orden i "
 "muc_highlight_words, eller när MUC-meddelande innehåller ditt smeknamn."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ljud att spela upp när ett MUC-meddelande anländer."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Kunde inte läsa in idle-modul"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Fel värd"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Ogiltig lokal adress? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registreringsinformation för transporten %s har inte kommit fram i tid"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 msgid "Registration succeeded"
 msgstr "Registreringen lyckades"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s lyckades"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 msgid "Registration failed"
 msgstr "Registreringen misslyckades"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4234,39 +4254,39 @@ msgstr ""
 "Registrering med agenten %(agent)s misslyckades med fel %(error)s: %"
 "(error_msg)s"
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Osynlighet stöds inte"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Kontot %s saknar stöd för osynlighet."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4276,79 +4296,86 @@ msgstr ""
 "gajim.org/wiki/DatabaseBackup) eller ta bort den (alla historik kommer att "
 "förloras)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Smeknamnet tillåts inte: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du är bannlyst från gruppchatten %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppchatten %s finns inte."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Möjligheten att skapa rum är begränsad."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerade smeknamn måste användas."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du är inte med i medlemslistan i gruppchatten %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan gå in i detta rum istället: %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi prenumererar nu på %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "avprenumerationsförfrågan från %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi prenumererar inte längre på %s"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4358,221 +4385,207 @@ msgstr ""
 "kontaktlista. Använd kontakthanteringsverktyg såsom http://jru.jabberstudio."
 "org/  för att ta bort det"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Lösenordsfras för OpenPGP angavs inte"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "Du kommer ansluta till %s utan OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Kunde inte få tag på utfärdarens certifikat"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Kunde inte få tag på certifikatspärrlista"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Kunde inte dekryptera certifikatets signatur"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Kunde inte dekryptera spärrlistans signatur"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Kunde inte avkoda utfärdarens publika nyckel"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Fel i certifikatsignatur"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Fel i spärrlistans signatur"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet är ännu inte giltigt"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Certifikatet har gått ut"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "Spärrlistan är ännu inte giltig"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "Spärrlistan har gått ut"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfel i certifikatets notBefore-fält"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfel i certifikatets notAfter-fält"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfel i spärrlistans lastUpdate-fält"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfel i spärrlistans nextUpdate-fält"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Självsignerat certifikat"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Självsignerat certifikat i certifikatkedja"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Kunde inte verifiera det första certifikatet"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Certifikatkedjan är för lång"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Certifikatet spärrat"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Ogiltigt CA-certifikat"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Certifikatet är inte pålitligt"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Certifikatet nekades"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "Nyckelanvändning inkluderar inte certifikatsignering"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Återanslut manuellt."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Servern %(name)s svarade felaktigt på en registreringsbegäran: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Servern %s tillhandahöll ett annat registreringsformulär"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Okänt SSL-fel: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarade felaktigt på en registreringsbegäran: %(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Kontrollera din anslutning eller försök igen senare."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Sparad i: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Anslutning till proxyservern misslyckades"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunde inte ansluta till kontot %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Anslutningen med kontot \"%s\" har förlorats. Försök att ansluta igen."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4581,7 +4594,7 @@ msgstr ""
 "\n"
 "SSL-fel: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4590,55 +4603,55 @@ msgstr ""
 "\n"
 "Okänt SSL-fel: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Kontrollera din anslutning eller försök igen senare"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering mot \"%s\" misslyckades"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Kontrollera ditt inloggningsnamn och lösenord."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "problem vid sändning %s ( %s )"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Detta meddelande är *krypterat* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4647,30 +4660,42 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Bjud in _kontakter"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Inte hämtad på grund av osynlig status"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Registreringen misslyckades"
+
+#: ../src/common/connection.py:1983
+#, fuzzy, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+"Registrering med agenten %(agent)s misslyckades med fel %(error)s: %"
+"(error_msg)s"
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Observerande"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Transporter"
 
@@ -4679,14 +4704,19 @@ msgid "Not in roster"
 msgstr "Inte i kontaktlista"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python-bindningar saknas på den här datorn"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-Bus-egenskaper kan inte användas"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2- (aka python-pysqlite2) beroende saknas. Stänger av..."
@@ -4761,56 +4791,69 @@ msgid "eleven"
 msgstr "elva"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "fem över %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "tio i %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "kvart över %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "twenty past %(0)s"
 msgstr "tio i halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, fuzzy, python-format
 msgid "twenty five past %(0)s"
 msgstr "fem i halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, fuzzy, python-format
 msgid "half past %(0)s"
 msgstr "halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "fem över halv %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "tjugo i %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "kvart i %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "tio i %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "fem i %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s"
 
@@ -4878,225 +4921,225 @@ msgstr "Ogiltigt tecken i värdnamn."
 msgid "Invalid character in resource."
 msgstr "Ogiltigt tecken i resurs."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Tillgänglig"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "Fr_ånvarande"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Osynlig"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?kontakt har status:Har fel"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Prenumeration vi redan har:Ingen"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "Till"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Båda"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Fråga (för prenumeration):Ingen"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Ägare"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Administratör"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "skriver ett meddelande..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d meddelande väntar"
 msgstr[1] "%d meddelanden väntar"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " från rummet %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " från användaren %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " från %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d väntande händelse"
 msgstr[1] "%d väntande händelser"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Fel vid körning av \"%(command)s\": %(error)s"
@@ -5112,11 +5155,11 @@ msgstr "%s är inte en giltig loggnivå"
 msgid "error: cannot open %s for reading"
 msgstr "fel: kan inte öppna %s för läsning"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "migrerar loggdatabas till index"
 
@@ -5770,7 +5813,7 @@ msgstr ""
 "Du kanske har en annan Gajiminstans igång. Filöverföringen kommer stängas."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5778,7 +5821,7 @@ msgstr ""
 "[Detta är en del av en krypterad session. Om du ser detta meddelande så har "
 "någonting gått fel.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5787,15 +5830,27 @@ msgstr ""
 "Värden %s som du konfigurerade som det avancerade alternativet "
 "ft_add_hosts_to_send är inte giltig, därför ignoreras den."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Lösenordsfras för OpenPGP angavs inte"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du kommer ansluta till %s utan OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "För att fortsätta skicka och ta emot meddelanden måste du återansluta."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahifel"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5804,31 +5859,31 @@ msgstr ""
 "%s\n"
 "Link-local-meddelanden kanske inte fungerar korrekt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontrollera om Avahi eller Bonjour är installerat."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Kunde inte starta lokal tjänst"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Kunde inte binda till port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontrollera om avahi-daemon körs."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunde inte ändra status för kontot \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5837,20 +5892,20 @@ msgstr ""
 "skickas."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Det här meddelandet är krypterat]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Ditt meddelande kunde inte skickas."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten är nerkopplad. Ditt meddelande kunde inte skickas."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5862,24 +5917,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Fel när tjänsten lades till. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Avstängd"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Standardmeddelande"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbok för språket %s inte tillgängligt"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5888,207 +5943,213 @@ msgstr ""
 "Du måste installera %s ordboken för att använda stavningskontroll, eller "
 "välj ett annat språk genom att sätta valet speller_language"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Återanslut nu?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Om du vill att ändringarna skall ske omedelbart måste du återansluta."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP är inte användbar på den här datorn"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Olästa händelser"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "Läs alla väntande händelser innan du tar bort detta konto."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har öppnat chatt i kontot %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alla chatts- och gruppchattsfönster kommer stängas. Vill du fortsätta?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "För att ändra kontonamnet måste du vara frånkopplad"
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "För att ändra kontonamnet måste du läsa alla väntande händelser."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Kontonamn används redan"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Byt namn på konto"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Ange ett nytt namn för kontot %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ett Jabber-ID måste vara av formen \"användare@servernamn\"."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Det uppstod problem när dina hemliga OpenPGP-nycklar skulle hämtas."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Val av OpenPGP-nyckel"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Du måste skapa ditt konto innan du redigerar din personliga information."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan inte redigera din personliga information utan en anslutning."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Din server saknar stöd för Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Din server kan inte spara din personliga information."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "För att ändra kontonamnet måste du vara frånkopplad"
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Kontot Local används redan."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Byt namn eller ta bort det innan du aktiverar link-local-meddelanden."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Bannlista"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Ägarlista"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Administratörslista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6096,11 +6157,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6108,11 +6169,11 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6120,11 +6181,11 @@ msgstr ""
 "<b>Vem vill du göra till ägare?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Lägger till administratör..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6132,7 +6193,7 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6149,58 +6210,58 @@ msgstr ""
 "4. domän (domänen i sig matchar, så gör även alla användare@domän,\n"
 "domän/resurs, eller adress som innehåller en underdomän."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Ange ditt lösenord för kontot %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:Alla"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "In- och utgång enbart"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Ny gruppchatt"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6208,66 +6269,64 @@ msgstr ""
 "bokmärket."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Smeknamnet tillåts inte: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Ogiltig server"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Kontot har lagts till"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Du kan ställa in avancerade alternativ genom att trycka på \"Avancerat\", "
 "eller senare genom att använda \"Redigera->Konton\" från huvudfönstret."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Ditt nya konto har skapats"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "Du behöver ange ett användarnamn för att konfigurera detta konto."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr "Ange en server på vilken du vill registrera."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Certifikatet finns redan i filen"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6282,7 +6341,7 @@ msgstr ""
 "SSL-fel: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6293,70 +6352,70 @@ msgstr ""
 "SHA1-fingeravtryck för certifikatet:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Ett fel uppstod när kontot skapades"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Första meddelandet mottaget"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Nästa meddelande blev fokuserat"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Nästa meddelande blev ofokuserat"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Kontakt loggade in"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Kontakt loggade ut"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Meddelande skickat"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Meddelande markerat i gruppchatt"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Meddelande mottaget i gruppchatt"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "E-post mottaget på GMail"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6365,74 +6424,74 @@ msgstr ""
 "Texten under denna linje är vad som har sagts sedan du senast hade fokus på "
 "denna gruppchatt"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "A_vsluta"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL för uppslagsbok saknar ett \"%s\" och det är inte en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Öppna som _länk"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Igår"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagar sen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Jabber-ID finns redan i listan"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
@@ -6467,119 +6526,119 @@ msgstr "Kontaktnamn"
 msgid "Set Mood"
 msgstr "Ange humör"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Statusmeddelande för %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Skriv över statusmeddelande?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Spara som Valbart Statusmeddelande"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Ange ett namn för detta statusmeddelande"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM-adress:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG-nummer:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ-nummer:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN-adress:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo!-adress:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Fyll i informationen om kontakten du vill lägga till i konto %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Fyll i informationen om kontakten du vill lägga till"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan inte lägga till dig själv i din kontaktlista."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i kontaktlistan"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Denna kontakt finns redan i din kontaktlista."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Användar-id:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabberklient"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ version:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK version:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Nuvarande utvecklare:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "TACK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Sist men inte minst vill vi tacka alla anvsraiga paketerare."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -6589,7 +6648,7 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6602,90 +6661,100 @@ msgstr ""
 "\n"
 "Markeringsfunktionen för felstavade ord kommer inte att användas"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "Smeknamnet innehåller icke-tillåtna tecken."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Prenumerationsbegäran för kontot %(account)s från %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du är redan i gruppchatten %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt med konto %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Ogiltigt kontonamn"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Konto från vilket du vill gå in i rummet"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Det här är ingen gruppchatt"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s är inte namnet på en gruppchatt."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Detta konto är inte anslutet till servern"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan inte synkronisera med ett konto utan att vara ansluten."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Synkronisera"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6694,301 +6763,301 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "Anslutningen är inte tillgänglig"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Ogiltigt JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kunde inte tolka \"%s\"."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan inte ändra ditt lösenord utan en anslutning."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakten loggade in"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakten ändrade status"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Ett meddelande med kontot %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Ett meddelande i kontot %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Från %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konsol för %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "XML-konsol"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Jag vill lägga till dig i min kontaktlista."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 #, fuzzy
 msgid "Add"
 msgstr "Adress"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Lynnig"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber-ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Grupp"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privat identitetslista <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privat integritetslista för %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ordning: %(order)s, åtgärd: %(action)s, typ: %(type)s, värde: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordning: %(order)s, åtgärd: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redigera en regel</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Lägg till en regel</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privata integritetslistor för %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Integritetslistor"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Ogiltigt listnamn"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Du måste ange ett namn för att skapa en integritetslista."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Du är inbjuden till en gruppchatt"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har bjudit in dig till en diskussion"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har bjudit in dig till gruppchatten %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Vill du acceptera inbjudan?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "När %s blir:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Lägger Till Speciellt Meddelande För %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Villkor"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "när jag är "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6999,38 +7068,38 @@ msgstr ""
 "\n"
 "Denna sessions Short Authentication String är <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Du har redan verifierat identiteten för denna kontakt."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet är verifierad"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Verifiera igen..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet är INTE verifierad"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Verifiera..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifierat kontaktens identitet?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7040,26 +7109,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7152,20 +7221,20 @@ msgstr "Beskrivning"
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Bokmärke finns redan"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppchatten \"%s\" finns redan i dina bokmärken."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Bokmärket har lagts till"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i din kontaktlista."
 
@@ -7177,15 +7246,15 @@ msgstr "Prenumererar"
 msgid "Node"
 msgstr "Nod"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "Säg _upp prenumeration"
 
@@ -7619,31 +7688,31 @@ msgstr "Gajim behöver Xserver för att köra. Avbryter..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim behöver PyGTK 2.8 eller senare"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim behöver PyGTK 2.8 eller senare för att köra. Avbryter..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim behöver GTK 2.8 eller senare"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim behöver GTK 2.8 eller senare för att köra. Avbryter..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime saknar libgladestöd"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7652,20 +7721,20 @@ msgstr ""
 "Ta bort din nuvarande GTK+ runtime och installera senaste stabila version "
 "från %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Kontrollera att GTK+ och PyGTK har libglade-stöd i ditt system."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim behöver PySQLite2 för att fungera"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim behöver pywin32 för att köra"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7674,11 +7743,11 @@ msgstr ""
 "Kontrollera att Pywin32 är installerat på ditt system. Du kan hämta det på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim körs redan"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7686,36 +7755,36 @@ msgstr ""
 "En annan instans of Gajim verkar redan vara igång\n"
 "Starta ändå?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Ange GPG-nyckelns lösenfras för nyckeln %(keyid)s (kontot %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Ingen GPG-nyckel tilldelad"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Du kommer ansluta till %s utan OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7726,59 +7795,59 @@ msgstr ""
 "av\n"
 "en annan deltagare. Ange ett annat smeknamn nedan:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterar du den här begäran på kontot %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s)-auktorisering för %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Anslutningsfel"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fel %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fel vid sändning av %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Prenumerationsbegäran"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7786,77 +7855,77 @@ msgstr ""
 "Du kommer alltid att se honom eller henne som frånkopplad.\n"
 "Vill du ta bort honom eller henne från din kontaktlista?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Säg _upp prenumeration"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s är nu känd som %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s är nu %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har ställt in ämnet till %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Rummet visar nu otillgängliga medlemmar"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "rummet visar nu inga otillgängliga medlemmar"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Rumsloggning är nu aktiverad"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Rumsloggning är nu inaktiverad"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Ett lösenord krävs för att gå in i rummet %s. Ange lösenordet."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7864,32 +7933,38 @@ msgstr ""
 "Du har konfigurerat Gajim till att använda GPG-agent, men det finns ingen "
 "GPG-agent igång eller så returnerade den en felaktig lösenfras.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Din lösenfras är inkorrekt."
+
+#: ../src/gajim.py:1559
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG är inte användbar"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "Fråga mig i_nte igen"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7898,19 +7973,19 @@ msgstr ""
 "Gnome Keyring är installerad men inte \t\t\t\t\t\t\tkorrekt startad "
 "(miljövariabeln är förmodligen inte \t\t\t\t\t\t\tkorrekt inställd)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Du har %d ny e-postkonversation"
 msgstr[1] "Du har %d nya e-postkonversationer"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -7925,90 +8000,90 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fel vid läsning av fil:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(filename)s har mattagits från %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(filename)s har skickats till %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Överföringen av %(filename)s till %(name)s har stannat."
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Kunde inte dekryptera meddelande"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Användarnamn-konflikt"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "Ange ett nytt användarnamn för ditt lokala konto"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Fel."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Resurskonflikt"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Du är redan ansluten till detta konto med samma resurs. Ange en annan"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Fel vid verifiering av SSL-certifikat"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8019,15 +8094,15 @@ msgstr ""
 "server: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ignorera detta fel med certifikatet."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "SSL-certifikatfel"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8044,11 +8119,11 @@ msgstr ""
 "\n"
 "Vill du fortfarande ansluta och uppdatera fingeravtrycket för certifikatet?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8056,11 +8131,11 @@ msgstr ""
 "Du är på väg att skicka ditt lösenord över en okrypterad anslutning. Är du "
 "säker på att du vill göra det?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jag vill verkligen ansluta på ett osäkert sätt"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8069,40 +8144,40 @@ msgstr ""
 "installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
 "skicka lösenordet?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Känsloikoner inaktiverade"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan inte gå in i en gruppchatt när du är osynlig"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
@@ -8137,12 +8212,13 @@ msgstr ""
 "hamnar på en egen rad"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "konto"
 
@@ -8167,9 +8243,9 @@ msgstr "status"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "meddelande"
 
@@ -8186,23 +8262,47 @@ msgstr ""
 "alla konton som har alternativet \"synkronisera med global status\" inställt"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Ändrar status för konto eller konton"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Priori_tet:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Jag vill _registrera ett nytt konto"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"ändra status för kontot \"konto\". Om inte angivet, försök ändra status på "
+"alla konton som har alternativet \"synkronisera med global status\" inställt"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Visa chattdialogen så att du kan skicka meddelanden till en kontakt"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID för kontakten som du vill chatta med"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "om specificerat tas kontakten bort från kontaktlistan för det här kontot"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8213,30 +8313,30 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID för kontakten som kommer ta emot meddelandet"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "meddelandeinnehåll"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "pgp-nyckel"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "om specificerat kommer meddelandet bli krypterat med den här publika nyckeln"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "om specificerat kommer meddelandet bli skickat genom det här kontot"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8247,137 +8347,137 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "ämne"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "meddelandeämne"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Skickar nytt meddelande till en gruppchatt som du gått in i."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID för rummet som kommer ta emot meddelandet"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Hämta detaljerad information om kontakt"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID för kontakten"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Hämtar detaljerad information för kontakt"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Namn för kontot"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Skicka fil till en kontakt"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Sökväg"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "om specificerat kommer filen bli skickad genom det här kontot"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Listar alla inställningar och deras värden"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sätter värdet av \"nyckel\" till \"värde\"."
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "\"nyckel\" är namnet på inställningen, \"värde\" är värdet att sätta den till"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Tar bort en inställning"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "nyckel"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "namnet på inställningen som skall tas bort"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver Gajims nuvarande inställningar till .config-filen"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Lägger till en kontakt till kontaktlistan"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Lägger till ny kontakt till detta kontot"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande status (global status om inget konto specificerats)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande statusmeddelande (det globala om inget konto "
 "specificerats)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Returnerar antalet olästa meddelanden"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Öppnar \"Starta chatt\" dialogen"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Startar chatt, med detta kontot"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Skickar anpassad XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML att skicka"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8385,72 +8485,72 @@ msgstr ""
 "Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
 "skickas till alla konton"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Hantera en xmpp:/ URI"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "URI att hantera"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Konto i vilket du vill hanterare den"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "meddelandeinnehåll"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Gå in i ett MUC-rum"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "rum"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "Rummets JID"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "smeknamn"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Smeknamn att använda"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "lösenord"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Lösenord för att gå in i rummet"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Konto från vilket du vill gå in i rummet"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Kontrollera om Gajim är igång"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Visar eller döljer ipython-fönstret"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8459,17 +8559,17 @@ msgstr ""
 "\"%s\" finns inte i din kontaktlista.\n"
 "Ange konto för att skicka meddelandet."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Det verkar som om Gajim inte är igång. Därför kan du inte använda gajim-"
 "remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8478,16 +8578,16 @@ msgstr ""
 "Användning: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Parametrar:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s kunde inte hittas"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8496,7 +8596,7 @@ msgstr ""
 "Användning: %s kommando [parametrar]\n"
 "Kommando är en av:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8505,7 +8605,7 @@ msgstr ""
 "För många argument. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer information"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8514,7 +8614,7 @@ msgstr ""
 "Argumentet \"%(arg)s\" är inte angivet. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer info"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Fel Lösenfras"
@@ -8544,314 +8644,174 @@ msgstr "Du kan inte ta bort ditt nuvarande tema"
 msgid "Please first choose another for your current theme."
 msgstr "Välj först ett annat för ditt aktuella tema."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du är inte längre i gruppchatten \"%(room)s\" eller \"%(nick)s\" har lämnat."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Infoga smeknamn"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Konversation med "
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Fortsatt konversation"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Rumsloggning är aktiverad"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Ett nytt rum har skapats"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Servern har tilldelat eller ändrat ditt rumsnamn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Anknytning: "
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "rumskonfigurationen har ändrats till members-only"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen för %(nick)s har ställts in till %(role)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen för %(nick)s har ställts in till %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har gått in i gruppchatten"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Smeknamnet kunde inte hittas: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "Denna gruppchatt saknar ämne"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Smeknamnet kunde inte hittas: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Användning: /%s <smeknamn|JID> [reason], bannlyser JID från rummet. "
-"Smeknamnet kan substitueras, men inte om det innehåller \"@\". Of JID "
-"befinner sig i rummet kommer han/hon/den/det också att att bli sparkad. "
-"Stödjer INTE mellanslag i smeknamn."
-
-#: ../src/groupchat_control.py:1734
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Användning: /%s <semknamn>, öppnar ett privat chattfönster till den "
-"specificerade deltagaren."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Användning: /%s [anledning], stänger aktuellt fönster eller flik och visar "
-"anledning om sådan specificerades."
-
-#: ../src/groupchat_control.py:1746
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Användning: /%s <JID> [anledning], bjuder in JID till aktivt rum med en "
-"valbar anledning."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Användning: /%s <rum>@<server>[/smeknamn], erbjuder att delta i rum@server "
-"med valbart smeknamn"
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Användning: /%s <smeknamn> [anledning], tar bort medlemmen angiven med "
-"smeknamn från gruppchatten och visar en valfri anledning. Tillåter INTE "
-"blanksteg i smeknamnet."
-
-#: ../src/groupchat_control.py:1762
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Användning: /%s <smeknamn> [meddelande], öppnar ett privat meddelandefönster "
-"och skickar ett meddelande till medlemmen specificerad med smeknamn."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Användning: /%s <smeknamn>, ändrar ditt smeknamn i aktuell gruppchatt."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Användning: /%s, visa namnen för gruppchattens deltagare."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Användning: /%s [ämne], visar eller uppdaterar ämnet för aktuell gruppchatt."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Användning: /%s <meddelande>, skickar meddelande utan att leta efter andra "
-"kommandon."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "Användning: /%s <smeknamn>, ändrar ditt smeknamn i aktuell gruppchatt."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Är du säker på att du vill lämna gruppchatten \"%s\"?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Du kommer att bli frånkopplad från denna gruppchatt om du stänger detta "
 "fönster."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Förstör %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
@@ -8924,6 +8884,14 @@ msgstr "Bilden kan inte sparas i %(type)s format. Spara som %(new_filename)s?"
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Ny gruppchatt"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Jag skulle vilja lägga till dig i min kontaktlista"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Kan inte hitta historie- och logdatabas"
@@ -9004,52 +8972,62 @@ msgstr "Konversationshistorik med %s"
 msgid "Disk Error"
 msgstr "Diskfel"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s är nu %(status)s:%(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Felmeddelande: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Fel."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status är nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Tidsgräns översteg vid inläsning av bild"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Bild är för stor"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Vill du verkligen ta bort det valda meddelandet?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Chattar"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Gruppchatt"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Meddelanden"
 
@@ -9109,18 +9087,18 @@ msgstr "Ignorera"
 msgid "Retrieving profile..."
 msgstr "Hämtar profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Filen är tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Kunde inte läsa in bild"
 
@@ -9152,48 +9130,48 @@ msgstr ""
 "Det uppstod ett fel vid publiceringen av er personliga information, försök "
 "igen senare."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Om \"%s\" accepterar din förfrågan kommer du att känna till hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG är inte användbar"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9201,28 +9179,28 @@ msgstr ""
 "Om du byter status till osynlig kommer du att förlora anslutningen till "
 "gruppchatterna. Är du säker på att du vill byta status till osynlig?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "inte i synk"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Är du säker på att du vill lämna rummet \"%s\"?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9231,16 +9209,16 @@ msgstr ""
 "Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
 "historik påslagen."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Du måste läsa dem innan du tar bort denna transport."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9249,11 +9227,11 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "från denna transport."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Transporter kommer att tas bort"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9262,59 +9240,71 @@ msgstr ""
 "Du kommer inte längre att kunna ta emot eller skicka meddelanden till "
 "kontakter från dessa transporter: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr ""
+"Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Byt namn på kontakt"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Ange ett nytt smeknamn för kontakten %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Byt namn på grupp"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Ange ett nytt namn för gruppen %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Vill du ta bort gruppen %s från kontaktlistan?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ta bort en kontakt från register"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" kommer att tas bort från kontaktlistan"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Du är på väg att ta bort \"%(name)s\" (%(jid)s) från din kontaktlista.\n"
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9323,11 +9313,11 @@ msgstr ""
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9335,18 +9325,18 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
 "Kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Jag vill att denna kontakten skall känna till min status även efter "
 "borttagningen"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter kommer att tas bort från din kontaktlista"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9355,19 +9345,33 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen "
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr ""
+"Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter kan inte lagras på din server"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9375,13 +9379,13 @@ msgstr ""
 "Din server saknar stöd för att lagra information om metakontakter. Denna "
 "information kommer därför inte att sparas vid nästa återanslutning."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9391,24 +9395,24 @@ msgstr ""
 "Normalt sätt används det när en person har flera Jabberkonton eller "
 "transportkonton."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ogiltig Fil"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vill du skicka denna fil till %s:"
 msgstr[1] "Vill du skicka dessa filer till %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Skicka %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gör %s till en metakontakt för %s"
@@ -9418,115 +9422,127 @@ msgstr "Gör %s till en metakontakt för %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "använder kontot %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "till %s konto"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "använder %s-kontot"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Hantera bokmärken..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Ändra statusmeddelande"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Publicera låt"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Konfigurera tjänster..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Maximera alla"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Skicka gruppm_eddelande"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Till alla användare"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Till alla anslutna användare"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Jag skulle vilja lägga till dig i min kontaktlista"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Hantera kontakter"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Redigera _grupper"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Skicka ett meddelande"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Kör kommando..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Hantera transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Ändra transport"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "Byt _namn"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Maximera"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Koppla från"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Ny gruppchatt"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Koppla från"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Historikhanterare"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Gå in i ny gruppchatt"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Ändra statusmeddelande..."
 
@@ -9543,20 +9559,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Ämne: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Bekräfta dessa sessionsalternativ"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9571,7 +9587,7 @@ msgstr ""
 "\n"
 "\tGodtar du dessa alternativ?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9764,6 +9780,141 @@ msgstr "Det finns inga väntande prenumerationsbegäran."
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Lägg till speciell _notifiering"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Tilldela Open_PGP-nyckel"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Kommandot stöds inte för zeroconf-konto."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Kommandon: %s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Användning: /%s, tömmer textfönstret."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Användning: /%s, döljer chattknapparna."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Användning: /%(command)s <åtgärd>, skickar åtgärd till aktuell "
+#~ "gruppchatt. Använd tredje person. (t.ex. /%(command)s exploderar.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Användning: /%s, skickar en ping till kontakten"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Användning: /%s, skickar meddelandet till kontakten"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Ingen hjälp för /%s"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Aktivera link-local-/zeroconf-meddelanden"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Smeknamnet kunde inte hittas: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "Denna gruppchatt saknar ämne"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Smeknamnet kunde inte hittas: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Användning: /%s <smeknamn|JID> [reason], bannlyser JID från rummet. "
+#~ "Smeknamnet kan substitueras, men inte om det innehåller \"@\". Of JID "
+#~ "befinner sig i rummet kommer han/hon/den/det också att att bli sparkad. "
+#~ "Stödjer INTE mellanslag i smeknamn."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Användning: /%s <semknamn>, öppnar ett privat chattfönster till den "
+#~ "specificerade deltagaren."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Användning: /%s [anledning], stänger aktuellt fönster eller flik och "
+#~ "visar anledning om sådan specificerades."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Användning: /%s <JID> [anledning], bjuder in JID till aktivt rum med en "
+#~ "valbar anledning."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Användning: /%s <rum>@<server>[/smeknamn], erbjuder att delta i "
+#~ "rum@server med valbart smeknamn"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Användning: /%s <smeknamn> [anledning], tar bort medlemmen angiven med "
+#~ "smeknamn från gruppchatten och visar en valfri anledning. Tillåter INTE "
+#~ "blanksteg i smeknamnet."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Användning: /%s <smeknamn> [meddelande], öppnar ett privat "
+#~ "meddelandefönster och skickar ett meddelande till medlemmen specificerad "
+#~ "med smeknamn."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Användning: /%s <smeknamn>, ändrar ditt smeknamn i aktuell gruppchatt."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Användning: /%s, visa namnen för gruppchattens deltagare."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Användning: /%s [ämne], visar eller uppdaterar ämnet för aktuell "
+#~ "gruppchatt."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Användning: /%s <meddelande>, skickar meddelande utan att leta efter "
+#~ "andra kommandon."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Användning: /%s <smeknamn>, ändrar ditt smeknamn i aktuell gruppchatt."
+
 #~ msgid "Your JID:"
 #~ msgstr "Ditt JID:"
 
diff --git a/po/uk.po b/po/uk.po
index 1df2df163..50ee3792e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-20 00:06+0200\n"
 "Last-Translator: Sergiy Yegorov <prapor@unixzone.org.ua>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
@@ -218,6 +218,7 @@ msgstr "<b>Особиста інформація</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "Обліковий запис"
 
@@ -286,8 +287,8 @@ msgstr "Редагувати особисті відомості..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -298,8 +299,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "Загальне"
 
@@ -360,25 +361,21 @@ msgid "Information about you, as stored in the server"
 msgstr "Відомості про вас, які зберігаються на сервері"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "Не обрано жодного ключа"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "Немає"
 
@@ -535,8 +532,8 @@ msgstr ""
 "Можливо, вам також доведеться змінити параметри брандмауера."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -550,7 +547,7 @@ msgid "Mer_ge accounts"
 msgstr "Об’є_днати облікові записи"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "Пере_йменувати"
 
@@ -801,7 +798,7 @@ msgid "All statuses"
 msgstr "Усі стани"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "Далеко"
 
@@ -818,7 +815,7 @@ msgid "Have "
 msgstr "Має "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "Невидимка"
 
@@ -827,7 +824,7 @@ msgid "Launch a command"
 msgstr "Запустити команду"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "Дуже далеко"
 
@@ -1013,7 +1010,7 @@ msgid "Join _Group Chat"
 msgstr "Приєднатись до _групової балачки"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 msgid "_Add to Roster..."
 msgstr "_Додати до реєстру..."
 
@@ -1039,39 +1036,6 @@ msgstr "_Відкрити посилання у веб-переглядачі"
 msgid "_Start Chat"
 msgstr "_Почати балачку"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Invite _Contacts"
-msgstr "Запросити _контакти"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Надіслати _файл"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle End to End Encryption"
-msgstr "Увімкнути або вимкнути наскрізне шифрування"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-msgid "Toggle Open_PGP Encryption"
-msgstr "Увімкнути або вимкнути Open_PGP-шифрування"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Додати до реєстру"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
-msgid "_History"
-msgstr "_Журнал"
-
 #: ../data/glade/chat_to_muc_window.glade.h:1
 msgid "In_vite"
 msgstr "_Запросити"
@@ -1096,6 +1060,119 @@ msgstr ""
 "Ви маєте намір почати групову балачку.\n"
 "Оберіть контакти, які ви бажаєте запросити"
 
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "З_апитати можливість бачити його/її стан"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Додати особливе _сповіщення"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Призначити кл_юч OpenPGP..."
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Виконати команду..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+msgid "Edit _Groups..."
+msgstr "Редагувати _групи..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "За_просити до"
+
+#: ../data/glade/contact_context_menu.glade.h:7
+msgid "Invite _Contacts"
+msgstr "Запросити _контакти"
+
+#: ../data/glade/contact_context_menu.glade.h:8
+msgid "Remo_ve"
+msgstr "В_илучити"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+msgid "Send Cus_tom Status"
+msgstr "Надіслати не_типовий стан"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "Надіслати окреме _повідомлення..."
+
+#: ../data/glade/contact_context_menu.glade.h:11
+msgid "Send _File..."
+msgstr "Надіслати _файл..."
+
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Встановити _нетиповий аватар..."
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "Почати _балачку"
+
+#: ../data/glade/contact_context_menu.glade.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Увімкнути або вимкнути наскрізне шифрування"
+
+#: ../data/glade/contact_context_menu.glade.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Увімкнути або вимкнути Open_PGP-шифрування"
+
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Дозволити йому/їй бачити мій стан"
+
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr "_Заблокувати"
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Заборонити йому/їй бачити мій стан"
+
+#: ../data/glade/contact_context_menu.glade.h:20
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+msgid "_History"
+msgstr "_Журнал"
+
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
+msgstr "_Ігнорувати"
+
+#: ../data/glade/contact_context_menu.glade.h:22
+msgid "_Manage Contact"
+msgstr "К_ерування контактом"
+
+#: ../data/glade/contact_context_menu.glade.h:23
+msgid "_Rename..."
+msgstr "Перей_менувати..."
+
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "_Підписка"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
+msgstr "_Розблокувати"
+
+#: ../data/glade/contact_context_menu.glade.h:26
+msgid "_Unignore"
+msgstr "_Скасувати ігнорування"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Заповніть форму."
@@ -1212,7 +1289,7 @@ msgstr ""
 "Рядок контакту\n"
 "Заголовок балачки"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "Жирний"
 
@@ -1236,7 +1313,7 @@ msgstr "Пішов"
 msgid "Inactive"
 msgstr "Неактивний"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1308,6 +1385,14 @@ msgstr "Мо_дератор"
 msgid "Occupant Actions"
 msgstr "Дії учасника"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "Надіслати _файл"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Додати до реєстру"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Адміністратор"
@@ -1316,13 +1401,6 @@ msgstr "_Адміністратор"
 msgid "_Ban"
 msgstr "_Заблокувати"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr "_Заблокувати"
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Викинути"
@@ -1339,13 +1417,6 @@ msgstr "_Власник"
 msgid "_Send Private Message"
 msgstr "_Надіслати конфіденційне повідомлення"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr "_Розблокувати"
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Голос"
@@ -1354,7 +1425,7 @@ msgstr "_Голос"
 msgid "Create new post"
 msgstr "Створити нове повідомлення"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "Від"
 
@@ -1380,8 +1451,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 "<big><b>Ласкаво просимо до інструменту керування журналами Gajim</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "Вилучити"
 
@@ -1435,34 +1506,39 @@ msgstr "Пошук:"
 msgid "_Log conversation history"
 msgstr "_Зберігати журнал спілкування"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "Зробити закладку на цій кімнаті (Ctrl+B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "Приєднатись до групової балачки"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 msgid "Join this room automatically when I connect"
 msgstr "Автоматично заходити до цієї кімнати після з’єднання"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "Псевдонім:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "Нещодавно:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Кімната:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "При_єднатися"
@@ -1493,7 +1569,7 @@ msgstr "Мінімізувати після автоматичного приє�
 msgid "Print status:"
 msgstr "Показувати стан:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -2034,7 +2110,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Впорядкувати контакти за станом"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "Стан"
 
@@ -2199,34 +2275,39 @@ msgid "All"
 msgstr "Всі"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "всі за підпискою"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "Дозволити"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "Відмовити"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "Порядок:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "Список конфіденційності"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "всі за підпискою"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "всі у групі"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2238,19 +2319,19 @@ msgstr ""
 "від\n"
 "до"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "для надсилання мені повідомлень"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "для надсилання мені запитів"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "для надсилання мені стану"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "для перегляду мого стану"
 
@@ -2418,96 +2499,11 @@ msgstr "Вилучити обліковий запис з Gajim та з _сер�
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "В_илучити"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "З_апитати можливість бачити його/її стан"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-msgid "Add Special _Notification..."
-msgstr "Додати особливе _сповіщення"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Призначити кл_юч OpenPGP..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-msgid "Edit _Groups..."
-msgstr "Редагувати _групи..."
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "Виконати команду..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "За_просити до"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-msgid "Remo_ve"
-msgstr "В_илучити"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-msgid "Send Cus_tom Status"
-msgstr "Надіслати не_типовий стан"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "Надіслати окреме _повідомлення..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "Send _File..."
-msgstr "Надіслати _файл..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr "Встановити _нетиповий аватар..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "Почати _балачку"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "_Дозволити йому/їй бачити мій стан"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "_Заборонити йому/їй бачити мій стан"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr "_Ігнорувати"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-msgid "_Manage Contact"
-msgstr "К_ерування контактом"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-msgid "_Rename..."
-msgstr "Перей_менувати..."
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "_Підписка"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-msgid "_Unignore"
-msgstr "_Скасувати ігнорування"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2628,7 +2624,7 @@ msgid "_Add contact"
 msgstr "Дод_ати контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 msgid "_Information"
 msgstr "_Інформація"
 
@@ -2844,26 +2840,6 @@ msgstr "_Повідомлення"
 msgid "_Presence"
 msgstr "П_рисутність"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Додати спеціальне _сповіщення"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Призначити ключ Open_PGP"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "Редагувати _групи"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "Пере_йменувати"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "_Змінити обліковий запис..."
@@ -2907,48 +2883,48 @@ msgid "Service returned an error."
 msgstr "Служба повернула повідомлення про помилку."
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Activated"
 msgstr "Увімкнено"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 msgid "Deactivated"
 msgstr "Вимкнено"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr "Булеве"
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 msgid "Integer"
 msgstr "Ціле число"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr "Колір"
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "Назва параметра"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "Значення"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(Немає)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "Сховано"
 
@@ -2962,186 +2938,185 @@ msgstr "Ви отримали новий запис:"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "Англійська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Belarusian"
 msgstr "Білоруська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Болгарська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Breton"
 msgstr "Бретонська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Чеська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "Німецька"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Грецька"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "British"
 msgstr "Британська англійська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Іспанська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Basque"
 msgstr "Баскська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "Французька"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Хорватська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Італійська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian (b)"
 msgstr "Норвезька (b)"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Нідерландська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Norwegian"
 msgstr "Норвезька"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Польська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Португальська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Бразильська португальська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Російська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Serbian"
 msgstr "Сербська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Словацька"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Шведська"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "Китайська (Ch)"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "Мова перевірки правопису"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "З'єднання недоступне"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше повідомлення не може бути відправлене до встановлення з'єднання."
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 msgid "Underline"
 msgstr "Підкреслити"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 msgid "Strike"
 msgstr "Перекреслити"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 msgid "Clear formating"
 msgstr "Зняти форматування"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr "Справді надіслати файл?"
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Якщо ви надішлете файл %s, він або вона дізнаються про ваш справжній "
 "ідентифікатор Jabber."
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 msgid "GPG encryption enabled"
 msgstr "Шифрування GPG увімкнено"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "Немає у реєстрі"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Перелік активних, завершених та зупинених передач файлів"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Невідомий виконавець"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Невідома назва"
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Невідоме джерело"
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3150,17 +3125,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "з <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групової балачки %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr "Немає ключа GPG"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3168,50 +3143,50 @@ msgstr ""
 "З цим контактом не пов’язано жодного ключа GPG. Отже ви не зможете шифрувати "
 "повідомлення за допомогою GPG."
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 msgid "GPG encryption disabled"
 msgstr "Шифрування GPG вимкнено"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr "Сеанс БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr "Сеанс НЕ БУДЕ записано до журналу"
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr "є"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr "НЕ є"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr "буде"
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr "НЕ буде"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 msgid "and authenticated"
 msgstr "і уповноваженим"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 msgid "and NOT authenticated"
 msgstr "і НЕ уповноваженим"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3220,67 +3195,23 @@ msgstr ""
 "Шифрування %(type)s %(status)s активним %(authenticated)s.\n"
 "Ваш сеанс балачки %(logged)s записано до журналу."
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr "Ця команда не підтримується для облікового запису zeroconf."
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "Команди:·%s"
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Використання: /%s, спорожнить вміст текстового вікна."
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Використання: /%s, сховає кнопки балачки."
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"Використання: /%(command)s <action>, надішле повідомлення про заняття до "
-"поточної групової балачки. Буде використано третю особу. (наприклад, /%"
-"(command)s впав під стілець.)"
-
-#: ../src/chat_control.py:1777
-#, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Використання: /%s, надсилає луна-імпульс (пінг) контактові"
-
-#: ../src/chat_control.py:1780
-#, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "Використання: /%s, надсилає повідомлення контакту"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "Довідки для команди /%s не знайдено"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr "Встановлення сеансу було скасовано"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 msgid "This session is encrypted"
 msgstr "Цей сеанс зашифровано"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr " і БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr " і НЕ БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3288,25 +3219,25 @@ msgstr ""
 "Особу віддаленого контакту не було перевірено. Натисніть кнопку з щитом, щоб "
 "ознайомитися з подробицями."
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 msgid "E2E encryption disabled"
 msgstr "Шифрування E2E вимкнено"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 msgid "The following message was NOT encrypted"
 msgstr "Наступне повідомлення НЕ було зашифровано"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 msgid "The following message was encrypted"
 msgstr "Наступне повідомлення було зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Ви щойно отримали нове повідомлення від «%s»"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3314,15 +3245,15 @@ msgstr ""
 "Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде "
 "втрачено."
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr "Помилка бази даних"
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3331,7 +3262,7 @@ msgstr ""
 "Не вдалося прочитати файл бази даних (%s). Спробуйте виправити або вилучити "
 "його (всі записи журналу буде втрачено)."
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s тепер %(status)s"
@@ -3340,23 +3271,23 @@ msgstr "%(name)s тепер %(status)s"
 msgid "creating logs database"
 msgstr "створення бази даних журналів"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s є файлом, а має бути каталогом"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Зараз Gajim завершить роботу"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s є каталогом, а має бути файлом"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "створення каталогу %s"
@@ -3420,9 +3351,9 @@ msgstr "Оберіть групові балачки, які ви бажаєте
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 msgid "Groupchats"
 msgstr "Групові балачки"
 
@@ -3438,55 +3369,100 @@ msgstr "Переспрямувати непрочитані повідомлен
 msgid "All unread messages have been forwarded."
 msgstr "Всі непрочитані повідомлення було переспрямовано."
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr "Програвати звук, коли користувач зайнятий"
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Використовувати D-Bus і фонову службу сповіщень для показу сповіщень"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Показувати лише користувачів в мережі або бажаючих спілкуватись"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Час у хвилинах, за який ваш стан буде змінено на «відсутній»."
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr ""
 "$S (Позначено як «відсутній» через відсутність активності протягом $T хв)"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S буде замінено поточним повідомленням про стан, $T — часом автоматичного "
 "виявлення відсутності."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Час у хвилинах, за який ваш стан буде змінено на «недоступний»."
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr ""
 "$S (Позначено як «недоступний» через відсутність активності протягом $T хв)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S буде замінено поточним повідомленням про стан, $T — часом автоматичного "
 "виявлення недоступності."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Коли показувати піктограму у лотку. Можливі варіанти ніколи (never), при "
 "події (on_event) та завжди (always)."
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "Некоректний псевдонім"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "текст повідомлення про стан"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "Некоректний псевдонім"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "Зміна псевдоніма"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "текст повідомлення про стан"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3494,21 +3470,17 @@ msgstr ""
 "згорнуто."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 msgid "default"
 msgstr "типовий"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "Увімкнути обмін повідомленнями link-local/zeroconf"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "Мова, яку використовуватиме інструмент перевірки правопису"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3518,7 +3490,7 @@ msgstr ""
 "'sometimes' — виводити час кожні print_ichat_every_foo_minutes хвилин.\n"
 "'never' — ніколи не виводити час."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3529,18 +3501,18 @@ msgstr ""
 "найточніше відображення часу, 4 — найменш точне. Цей параметр буде "
 "використано, лише якщо параметр print_time має значення 'sometimes'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Вважати пари символів * / _ символами форматування."
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Якщо має значення «True», не вилучати */_ . Наприклад, рядок *abc* "
 "вважатиметься рядком з напівжирним шрифтом після вилучення позначок * *."
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3551,7 +3523,7 @@ msgstr ""
 "http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (якщо "
 "бажаєте користуватися ними, встановіть docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3559,7 +3531,7 @@ msgstr ""
 "Символ, який буде додано після псевдоніма, якщо ви використовуєте "
 "автоматичне доповнення псевдоніма (tab) у груповій балачці."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3567,7 +3539,7 @@ msgstr ""
 "Символ, який буде запропоновано додати після бажаного псевдоніма, якщо "
 "псевдонім буде використано кимось з групової балачки."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3578,19 +3550,19 @@ msgstr ""
 "\"[година:хвилина] \". Див. документацію з python щодо strftime, щоб "
 "дізнатися більше: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Символи, які буде показано перед псевдонімами під час спілкування"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Символи, які буде показано після псевдонімів під час спілкування"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "Додати * і [n] у заголовок реєстру?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3598,13 +3570,27 @@ msgstr ""
 "Кількість рядків тесту, які слід запам’ятати з попереднього спілкування для "
 "показу під час повторного відкриття вкладки або вікна балачки."
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Проміжок часу у хвилинах, протягом якого слід зберігати рядки попередньої "
 "розмови"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3612,11 +3598,11 @@ msgstr ""
 "Надсилати повідомлення за Ctrl+Enter, а за допомогою Enter розривати рядок "
 "(типова поведінка клієнта Mirabilis ICQ)."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Кількість рядків, які слід зберігати для Ctrl+Стрілка_вгору."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3625,13 +3611,13 @@ msgstr ""
 "Або нетипова адреса url з підрядком %s, де %s — слово або фраза, або "
 "'WIKTIONARY' (це означає, що слід використовувати службу wiktionary)."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Якщо позначено цей пункт, Gajim можна віддалено керувати за допомогою gajim-"
 "remote."
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3643,14 +3629,14 @@ msgstr ""
 "параметра listen_to_network_manager рівне «False» і вони синхронізуються з "
 "загальним станом) згідно до стану мережевого з’єднання."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Надсилати сповіщення про стан балачки. Може мати значення all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3658,7 +3644,7 @@ msgstr ""
 "Тип сповіщень про стан балачки, які буде показано у вікнах балачки. Може "
 "мати значення all, composing_only, disabled."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3666,11 +3652,11 @@ msgstr ""
 "Якщо не вказано, що програма має виводити час для кожного з повідомлень "
 "(print_time==sometimes), виводити час кожні x хвилин."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Запитувати перед закриттям вкладки або вікна групової балачки."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3679,7 +3665,7 @@ msgstr ""
 "балачки, яку вказано у цьому відокремленому пробілами списку jid групових "
 "балачок."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3688,13 +3674,13 @@ msgstr ""
 "балачки, яку вказано у цьому відокремленому пробілами списку jid групових "
 "балачок."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3703,27 +3689,27 @@ msgstr ""
 "інтерфейсів, для передавання файлів у випадку трансляції адрес або "
 "переспрямування портів."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Згідно до стандарту IEC: кіБ = 1024 байтам, кБ = 1000 байтам."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "Сповіщати про події змінами піктограми лотка."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "Показувати вкладку за умови єдиної бесіди?"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показувати бічну панель з вкладками у вікнах балачки?"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "Показувати кнопку закриття на вкладці?"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3736,19 +3722,19 @@ msgstr ""
 "Більші значення підвищують безпеку, але програма витрачатиме більше часу на "
 "їх обчислення під час запуску сеансу."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr ""
 "Здійснювати попередній перегляд нових повідомлень у виринаючому сповіщенні?"
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Список відокремлених крапкою з комою слів, які буде виділено у групових "
 "балачках."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3757,14 +3743,14 @@ msgstr ""
 "з позначкою «X» у менеджері вікон. Цей параметр братиметься до уваги, лише "
 "якщо використовується піктограма лотка."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Якщо має значення «True», Gajim перевірятиме, чи є програма типовим клієнтом "
 "jabber під час кожного запуску програми."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3773,7 +3759,7 @@ msgstr ""
 "вкладок, на якій містяться непрочитані повідомлення. Залежно від обраної "
 "вами теми, піктограму може бути анімовано."
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3782,11 +3768,11 @@ msgstr ""
 "стан, якщо це повідомлення не буде порожнім, для кожного з контактів під "
 "іменем контакту у вікні реєстру."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Визначає позицію аватару у реєстрі. Можливі значення: left і right"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3795,7 +3781,7 @@ msgstr ""
 "записів контактів, чий аватар не було отримано під час попереднього сеансу, "
 "або контактів, чиї аватари вважатимуться застарілими."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3804,7 +3790,7 @@ msgstr ""
 "рядок стану у балачках, коли контакт змінює свій стан і/або своє "
 "повідомлення про стан."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3819,30 +3805,30 @@ msgstr ""
 "до того, що Gajim виводитиме лише повідомлення про те, що «такий-то увійшов "
 "або полишив групову балачку»."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "Колір контактів, які тільки-но увійшли до мережі."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "Колір контактів, які тільки-но вийшли з мережі."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Якщо цей параметр матиме значення «True», відновлені повідомлення буде "
 "показано меншим ніж типовий шрифтом."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "Не показувати аватар транспорту."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "Не показувати реєстр на системній панелі задач."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3852,7 +3838,7 @@ msgstr ""
 "GTK+ і PyGTK не старіші за 2.8, у разі наявності подій у черзі позначка "
 "вікна програми почне блимати (типова поведінка у більшості менеджерів вікон)."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3863,7 +3849,7 @@ msgstr ""
 "«False», щоб вимкнути надсилання відомостей sha до сервера групової балачки."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3884,35 +3870,35 @@ msgstr ""
 "'pertype' — повідомлення буде розподілено за типом (наприклад, прості і "
 "групові балачки) між окремими вікнами."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Якщо цей параметр матиме значення «False», ви не бачитимете аватарів у вікні "
 "балачки."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Якщо цей параметр матиме значення «True», натискання клавіші escape "
 "закриватиме вкладку або вікно програми."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 msgid "Hides the buttons in chat windows."
 msgstr "Ховає кнопки у вікнах балачки."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "Приховує підпис у вікні групової балачки"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "Ховає підпис у вікні балачки між двома особами"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Ховає список учасників групової балачки у вікні групової балачки."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3920,16 +3906,16 @@ msgstr ""
 "У балачках, показувати псевдонім на початку рядка повідомлення, лише якщо це "
 "повідомлення не тої самої особи, якою було надіслано попереднє повідомлення."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Відступ за використання об’єднання послідовних повідомлень від однієї особи."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавне гортання повідомлень у вікні балачки"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3937,13 +3923,13 @@ msgstr ""
 "Список кольорів, відокремлених символом «:», які буде використано для "
 "розфарбовування псевдонімів у групових балачках."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab переводить до наступної вкладки створення повідомлення, якщо немає "
 "непрочитаних."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3951,7 +3937,25 @@ msgstr ""
 "Чи слід показувати діалогове вікно підтвердження створення метаконтактів? "
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Чи слід показувати діалогове вікно підтвердження створення метаконтактів? "
+"Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Чи слід показувати діалогове вікно підтвердження створення метаконтактів? "
+"Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
+
+#: ../src/common/config.py:259
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3962,7 +3966,7 @@ msgstr ""
 "облікового запису. БУДЬТЕ ОБЕРЕЖНІ за умови входу з від’ємним пріоритетом: у "
 "такому разі ви НЕ отримуватимете повідомлень від вашого сервера."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3970,7 +3974,7 @@ msgstr ""
 "Якщо цей параметр матиме значення «True», Gajim використовуватиме Gnome "
 "Keyring (за його наявності) для зберігання паролі облікових записів."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3979,7 +3983,7 @@ msgstr ""
 "Якщо цей параметр матиме значення «True», Gajim використовуватиме Gnome "
 "Keyring (за його наявності) для зберігання паролі облікових записів."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3988,7 +3992,7 @@ msgstr ""
 "контактів у мережі і загальну кількість контактів у рядках облікових записів "
 "і груп."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3997,7 +4001,7 @@ msgstr ""
 "непорожнє значення, вважати всі вхідні повідомлення повідомленнями вказано "
 "типу"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4006,7 +4010,7 @@ msgstr ""
 "у ньому контакт, яким вам було надіслано останнє повідомлення, якщо вікно "
 "балачки ще не було відкрито."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -4015,11 +4019,11 @@ msgstr ""
 "позначками $$ і $$ на зображення за допомогою dvips після перетворення його "
 "на формулу, і показуватиме зображення у вікні балачки."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Час відсутності активності потрібний для закриття вікна зміни стану."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4027,7 +4031,7 @@ msgstr ""
 "Максимальна кількість рядків, які буде показано протягом спілкування. "
 "Застарілі рядки понад вказане число вилучатимуться."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4036,13 +4040,13 @@ msgstr ""
 "сповіщення (notification-daemon) буде приєднано до піктограми у системному "
 "лотку."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Оберіть інтервал між двома послідовними перевірками на відсутність "
 "активності."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4050,7 +4054,7 @@ msgstr ""
 "За допомогою цього параметра можна регулювати розмір формул latex. Більші "
 "значення відповідають більшим символам формул."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4058,7 +4062,7 @@ msgstr ""
 "Чинні схеми uri. «Справжніми» uri вважатимуться лише схеми вказані у списку. "
 "(mailto і xmpp обробляються окремо)"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
@@ -4067,6 +4071,16 @@ msgstr ""
 "зв’язку.  УВАГА: це призведе до відсилання великої кількості запитів."
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4074,7 +4088,7 @@ msgstr ""
 "Пріоритет автоматично змінюватиметься залежно від вашого стану. Пріоритети "
 "визначаються за допомогою параметрів autopriority_*."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4083,26 +4097,39 @@ msgstr ""
 "значення: online, chat, away, xa, dnd, invisible. ЗАУВАЖЕННЯ: цей параметр "
 "використовуватиметься, лише якщо вимкнено параметр restore_last_status"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr "Якщо увімкнено, відновлювати попередній використаний стан."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Якщо цей параметр матиме значення «False», ви не бачитимете аватарів у вікні "
+"балачки."
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Якщо вимкнено, не підписувати повідомлення про присутність ключем GPG, "
 "навіть якщо GPG налаштовано для використання."
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr "Увімкнути шифрування ESession для цього облікового запису."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Чи має Gajim автоматично починати сеанс з шифруванням за можливості?"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4110,32 +4137,32 @@ msgstr ""
 "Впорядкований список відокремлених комами типів з’єднання, які має "
 "спробувати програма. Можливі значення: tls, ssl і plain"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати пароль "
 "нешифрованим з’єднанням."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж користуватися стандартною "
 "бібліотекою SSL."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Відокремлений пробілами список помилок ssl, які слід ігнорувати."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4146,11 +4173,11 @@ msgstr ""
 "з’єднання."
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Обхідний прийом для Jabberd2"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4159,15 +4186,15 @@ msgstr ""
 "проксі сервери, визначення параметром file_transfer_proxies, для передавання "
 "файлів."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr "Відповідати на запити щодо підтвердження отримання"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr "Надіслані запити на підтвердження отримання"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4175,11 +4202,11 @@ msgstr ""
 "Під час налаштування сеансу з шифруванням, чи слід Gajim припускати, що ви "
 "бажаєте вести запис повідомлень?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Чи увімкнено OpenPGP для цього контакту?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4187,101 +4214,101 @@ msgstr ""
 "Чи має Gajim за можливості автоматично запускати шифрований сеанс "
 "спілкування з цим контактом?"
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова, згідно правил якої відбуватиметься перевірка правопису слів"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "all або відокремлені пробілами стани"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' або 'both'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'так', 'ні' або ''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "Скоро повернуся"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "Повернуся за декілька хвилин."
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Їм"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "Зараз їм, залиште повідомлення, перегляну пізніше."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "Відео"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "Я дивлюся відео."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Працюю"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "Я працюю."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "Я розмовляю телефоном."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "Відійшов(шла)"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "Я насолоджуюся життям."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "Я — доступний (доступна) для балачки."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "Я — вільний (вільна) для балачки."
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "Скоро повернуся."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "Я — недоступний (недоступна) для балачки."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "Не турбувати."
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4290,102 +4317,102 @@ msgstr ""
 "зі слів, вказаних за допомогою параметра muc_highlight_words, або якщо "
 "повідомлення групової балачки містить ваш псевдонім."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "зелений"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "овочевий"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "тілесний"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "морський"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "Не вдалося завантажити модуль перевірки відсутності активності"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "Вузол вказано помилково"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr "Некоректна локальна адреса? :-O"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Відомості щодо реєстрації з транспорту %s не надійшли протягом визначеного "
 "проміжку часу"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 msgid "Registration succeeded"
 msgstr "Зареєструватися на %s"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Реєстрацію з агентом %s вдало закінчено"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 msgid "Registration failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Реєстрація з агентом %(agent)s невдала через помилку %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr "Помилка під час спроби запису на диск"
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 msgid "Invisibility not supported"
 msgstr "Невидимість не підтримується"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Обліковий запис %s не підтримує невидимості."
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 "Надійшло повідомлення від некоректного JID, це повідомлення було "
 "проігноровано."
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4395,79 +4422,86 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) або вилучити його (всі журнали "
 "буде втрачено)."
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Заборонений псевдонім: %s"
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вас заблокували у груповій балачці %s."
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Групової балачки %s не існує."
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "Можливість створення групових балачок обмежено."
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr ""
 "Для групової балачки %s слід використовувати псевдонім, під яким ви "
 "зареєструвалися."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас немає у списку постійних учасників групової балачки %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 msgid "Room has been destroyed"
 msgstr "Кімнату було знищено"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Ви можете приєднатися до цієї кімнати замість %s"
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "Я хочу додати вас до свого реєстру."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "тепер ми підписані на %s"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запит на скасування підписки від %s"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "підписку на %s скасовано"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4477,224 +4511,210 @@ msgstr ""
 "Скористайтеся інструментами для керування реєстром, наприклад, http://jru."
 "jabberstudio.org/ для його вилучення"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "Не було вказано пароля OpenPGP"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "З’єднання з %s буде встановлено без OpenPGP."
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr "Не вдається отримати сертифікат видавця"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr "Не вдалося отримати список відкликаних сертифікатів"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr "Не вдалося розшифрувати підпис сертифікату"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr "Не вдалося розшифрувати підпис списку відкликаних сертифікатів"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Unable to decode issuer public key"
 msgstr "Не вдалося декодувати відкритий ключ видавця"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr "Помилка під час підписування сертифіката"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr "Помилка під час роботи з підписом списку відкликаних сертифікатів"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr "Сертифікат ще не набув чинності"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr "Строк дії сертифікату завершився!"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr "Строк дії CRL ще не почався"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr "Строк дії CRL завершився"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr "Помилка форматування у полі сертифіката notBefore"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr "Помилка форматування у полі сертифіката notAfter"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Помилка форматування у полі сертифіката lastUpdate"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Помилка форматування у полі сертифіката nextUpdate"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr "Не вистачає пам'яті"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr "Сертифікат є самопідписаним"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопідписаний сертифікат у ланцюжку сертифікатів"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr "Не вдалося отримати сертифікат локального видавця"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr "Не вдалося перевірити перший сертифікат"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr "Ланцюжок сертифіката занадто великий"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr "Сертифікат відкликано"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Invalid CA certificate"
 msgstr "Некоректний сертифікат CA"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr "Перевищення обмеження на довжину адреси"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr "Непідтримуване призначення сертифіката"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr "Сертифікат є недостовірним"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr "Сертифікат відхилено"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr "Видано для іншого призначення"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr "Не збігаються поля видавця та ідентифікатора призначення ключа"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серійні номери служби сертифікації і видавця не збігаються"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr "До призначення ключа не належить підписування сертифікатів"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Помилка під час перевірки програми"
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "З’єднання з обліковим записом «%s» було втрачено"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "Виконати повторне з’єднання вручну."
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Від сервера %(name)s було отримано помилкову відповідь на запит щодо "
 "реєстрації: %(error)s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "На сервері %s передбачено іншу форму реєстрації"
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Невідома помилка SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "Некоректна відповідь"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспорт %(name)s надіслав помилкову відповідь на запит щодо реєстрації: %"
 "(error)s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не вдалося з’єднатися з «%s»"
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "Перевірте ваше з’єднання, а потім повторіть спробу."
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, python-format
 msgid "Server replied: %s"
 msgstr "Збережено за адресою: %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 msgid "Connection to proxy failed"
 msgstr "Спроба встановити з'єднання з проксі-сервером завершилася невдало"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не вдалося з’єднатися з обліковим записом %s"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "З’єднання з обліковим записом було втрачено %s. Повторна спроба з’єднання."
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Достовірність сертифіката %s знаходиться під питанням."
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
@@ -4703,7 +4723,7 @@ msgstr ""
 "\n"
 "Помилка SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, python-format
 msgid ""
 "\n"
@@ -4712,24 +4732,24 @@ msgstr ""
 "\n"
 "Невідома помилка SSL: %d"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "Перевірте ваше з’єднання або повторіть спробу пізніше"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Спроба розпізнавання за допомогою «%s» завершилася невдало"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "Будь ласка, перевірте, чи правильно вказано ім’я користувача і пароль."
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 msgid "Error while removing privacy list"
 msgstr "Помилка під час вилучення списку конфіденційності"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4739,18 +4759,18 @@ msgstr ""
 "у одному з ресурсів, з яким з’єднано ваш клієнт. Вимкніть цей ресурс і "
 "повторіть спробу."
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Неможливо надіслати повідомлення до %s, вказаний JID не є коректним."
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Не підписано повідомлення про присутність, ключа також не призначено."
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4758,12 +4778,12 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Це повідомлення *зашифровано* (див. :XEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4772,30 +4792,41 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Запросити _контакти"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "Не отримано через стан невидимості"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "Спроба з’єднання завершилася невдало"
+
+#: ../src/common/connection.py:1983
+#, fuzzy, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+"Реєстрація з агентом %(agent)s невдала через помилку %(error)s: %(error_msg)s"
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "Спостерігачі"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "Транспорти"
 
@@ -4804,14 +4835,19 @@ msgid "Not in roster"
 msgstr "Немає у реєстрі"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "У системі не знайдено прив’язок D-Bus-python"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Можливості роботи з D-Bus у Gajim не може бути використано"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
@@ -4889,56 +4925,69 @@ msgid "eleven"
 msgstr "одинадцята"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s година"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "п'ять хвилин по %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "десять хвилин по %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "чверть по %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "двадцять хвилин по %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "двадцять п'ять хвилин по %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "пів на %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "за двадцять п'ять хвилин %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "за двадцять хвилин  %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "за чверть %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "за десять хвилин %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "за п’ять хвилин %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s годин"
 
@@ -5006,190 +5055,190 @@ msgstr "Некоректний символ у назві вузла."
 msgid "Invalid character in resource."
 msgstr "Некоректний символ у назві ресурсу."
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "_Зайнятий"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "_Не доступний"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "_Вільний для балачки"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "Вільний для балачки"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "_Доступний"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "Доступний"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "Виконується з'єднання"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "В_ідійшов"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "_Поза мережею"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "Поза мережею"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "_Невидимий"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "Невідомий"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "З помилками"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "Немає"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "До"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "Обидва"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "Немає"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "Підписатися"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "Немає"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "Модератори"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "Учасники"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "Учасник"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "Відвідувачі"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "Відвідувач"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Немає"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "Власник"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "Адміністратор"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "Учасник"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "спілкується"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "робить щось інше"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "пише повідомлення..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "призупинив (призупинила) створення повідомлення"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "закрив (закрила) вікно або вкладку балачки"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s кіБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5197,22 +5246,22 @@ msgstr[0] "у черзі %d повідомлення"
 msgstr[1] "у черзі %d повідомлення"
 msgstr[2] "у черзі %d повідомлень"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from room %s"
 msgstr " з кімнати %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, python-format
 msgid " from user %s"
 msgstr " від користувача %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, python-format
 msgid " from %s"
 msgstr " від %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5220,12 +5269,12 @@ msgstr[0] "у черзі %d подія"
 msgstr[1] "у черзі %d події"
 msgstr[2] "у черзі %d подій"
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Помилка під час виконання «%(command)s»: %(error)s"
@@ -5241,11 +5290,11 @@ msgstr "%s не є коректним рівнем журналювання"
 msgid "error: cannot open %s for reading"
 msgstr "помилка: не вдалося відкрити %s для читання"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "блакитний"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 msgid "migrating logs database to indices"
 msgstr "перехід від бази даних журналів до покажчика"
 
@@ -5896,7 +5945,7 @@ msgstr ""
 "Можливо, запущено інший екземпляр Gajim. Передавання файла буде скасовано."
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5904,7 +5953,7 @@ msgstr ""
 "[Це частина шифрованого сеансу. Якщо ви бачите це повідомлення, сталася "
 "якась помилка.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5913,17 +5962,29 @@ msgstr ""
 "Вузол %s, який було налаштовано вами за допомогою параметра "
 "ft_add_hosts_to_send advanced записано некоректно, його буде проігноровано."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "Не було вказано пароля OpenPGP"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "З’єднання з %s буде встановлено без OpenPGP."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Щоб продовжити надсилання і отримання повідомлень, вам потрібно повторити "
 "процедуру з’єднання."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Помилка Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5932,31 +5993,31 @@ msgstr ""
 "%s\n"
 "Обмін локальними повідомленнями може працювати з помилками."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Будь ласка, переконайтеся, що встановлено Avahi або Bonjour."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "Не вдалося запустити локальну службу"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не вдалося прив’язатися до порту %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "Будь ласка, переконайтеся, що запущено фонову службу avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не вдалося змінити стан облікового запису «%s»"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5965,21 +6026,21 @@ msgstr ""
 "у стані невидимості. Ваше повідомлення не може бути надіслано."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[Це повідомлення зашифровано]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 msgid "Your message could not be sent."
 msgstr "Ваше повідомлення неможливо надіслати."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 "Контакт перебуває поза мережею. Ваше повідомлення не може бути надіслано."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5992,24 +6053,24 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Помилка під час додавання служби. %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "Вимкнено"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 msgid "Default Message"
 msgstr "Типове повідомлення"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Словники для мови %s не доступні"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6018,76 +6079,76 @@ msgstr ""
 "Ви маєте встановити словники %s для використання перевірки орфографії, або "
 "обрати іншу мову через параметр speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "заголовок повідомлення про стан"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "текст повідомлення про стан"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "Повторно увійти зараз?"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Якщо ви бажаєте, щоб всі зміни негайно набули чинності, вам слід вийти з "
 "облікового запису, а потім знову туди увійти."
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 msgid "OpenPGP is not usable on this computer"
 msgstr "На цьому комп'ютері OpenPGP не придатне для використання"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "Непрочитані події"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Перш ніж вилучати цей обліковий запис, прочитайте усі повідомлення з черги "
 "подій."
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Ви розпочали балачку за допомогою облікового запису %s"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити "
 "процедуру виходу?"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "Зараз ваш клієнт з’єднано з сервером"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 "Для зміни назви облікового запису вам слід від’єднати клієнт від сервера."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для зміни назви облікового запису вам слід прочитати усі повідомлення з "
 "черги подій."
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "Така назва облікового запису вже використовується"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6095,143 +6156,150 @@ msgstr ""
 "Ви вже створили обліковий запис з такою назвою. Будь ласка, оберіть іншу "
 "назву."
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "Некоректна назва облікового запису"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "Назва облікового запису не може бути порожньою."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "Назва облікового запису не може містити пробіли."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 msgid "Rename Account"
 msgstr "Перейменувати запис"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введіть нову назву для облікового запису %s"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ідентифікатор Jabber слід вказувати як «користувач@назва.сервера»."
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "Некоректний запис"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "Нетиповий порти слід вказувати у вигляді номера."
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "Спроба отримання закритих ключів завершилася невдало"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "Виникла проблема з отриманням ваших закритих ключів OpenPGP."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "Вибір ключа OpenPGP"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "Оберіть свій ключ OpenPGP"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "Вказаний обліковий запис недоступний"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Вам слід створити обліковий запис, перш ніж розпочати редагування ваших "
 "особистих відомостей."
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без з’єднання ви не зможете редагувати ваші особисті відомості."
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не підтримує Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може зберігати ваші особисті відомості."
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr ""
+"Для зміни назви облікового запису вам слід від’єднати клієнт від сервера."
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "Обліковий запис Local вже існує."
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Будь ласка, перейменуйте або вилучіть його, перш ніж вмикати локальні "
 "повідомлення."
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "Редагувати %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "Зареєструватися на %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "Список заборон"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "Список учасників"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "Список власників"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "Список адміністраторів"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "Підстава"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "Прізвисько"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "Роль"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "Блокування..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6239,11 +6307,11 @@ msgstr ""
 "<b>Кого ви бажаєте заблокувати?</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "Додавання учасника..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6251,11 +6319,11 @@ msgstr ""
 "<b>Кому ви бажаєте надати можливість участі?</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "Додавання власника..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6263,11 +6331,11 @@ msgstr ""
 "<b>Кого ви бажаєте зробити власником?</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "Додавання адміністратора..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6275,7 +6343,7 @@ msgstr ""
 "<b>Кого ви бажаєте зробити адміністратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6291,126 +6359,125 @@ msgstr ""
 "4. домен (пошук лише домену: записів користувач@домен,\n"
 "домен/ресурс або адреси, що містить піддомен)."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "Вилучення облікового запису %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "Слід ввести пароль"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введіть ваш пароль для облікового запису %s"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "Зберегти пароль"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "Якщо ви вилучите його, з’єднання буде розірвано."
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "Типовий"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "Всі"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "Лише вхід і вихід"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 msgid "?print_status:None"
 msgstr "Жодного"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "Створити групову балачку"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "У цій закладці містяться некоректні дані"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Будь ласка, заповніть поля сервера і кімнати або вилучіть цю закладку."
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 msgid "Invalid nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Заборонений псевдонім: %s"
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 msgid "Invalid server"
 msgstr "Некоректний сервер"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "Некоректний запис"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "Обліковий запис було успішно додано"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
+#, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "Додаткові параметри облікового запису можна вказати після натискання кнопки "
 "«Додатково». Пізніше ви можете виконати ті самі дії з налаштування вибором "
 "пункту «Облікові записи» у меню «Правка» головного вікна програми."
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "Ваш новий обліковий запис було успішно створено"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "Некоректне ім’я користувача"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Щоб налаштувати цей обліковий запис, вам слід вказати ім’я користувача."
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 msgid "Please provide a server on which you want to register."
 msgstr ""
 "Будь ласка, вкажіть назву сервера, на якому ви бажаєте зареєструватися."
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 msgid "Certificate Already in File"
 msgstr "Сертифікат вже наявний у файлі"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Цей сертифікат вже існує у файлі %s, програма не буде додавати його ще раз."
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6425,7 +6492,7 @@ msgstr ""
 "Помилка SSL: %(error)s\n"
 "Ви все ще бажаєте з’єднатися з цим сервером?"
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6436,63 +6503,63 @@ msgstr ""
 "Відбиток SHA1 сертифіката:\n"
 "%s"
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 msgid "An error occurred during account creation"
 msgstr "Під час спроби створення облікового запису сталася помилка"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "Цю назву облікового запису вже використано"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "У вас вже є обліковий запис з такою назвою."
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "Активний"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "Подія"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "Перше отримане повідомлення"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 msgid "Next Message Received Focused"
 msgstr "Фокус на наступне отримане повідомлення"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 msgid "Next Message Received Unfocused"
 msgstr "Зняття фокусу з наступного отриманого повідомлення"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "Контакт з'єднано"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "Контакт від'єднано"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "Повідомлення надіслано"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "Виділення повідомлення групової балачки"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "Отримано повідомлення групової балачки"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "Отримано електронного листа GMail "
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6502,7 +6569,7 @@ msgstr ""
 "отримано співрозмовником. Якщо програма показуватиме\n"
 "цю піктограму довго, ймовірно, повідомлення було втрачено."
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6510,75 +6577,75 @@ msgstr ""
 "Текст під цим рядком відповідає повідомленням, які було\n"
 "надіслано з часу, коли ви востаннє зазирали до цього вікна групової балачки"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "Ви_йти"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дії для «%s»"
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "Прочитати статтю у В_ікіпедії"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "Пошукати це у _словнику"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "У адресі URL словника не вказано «%s», або ключового слова WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адресі URL для пошуку у Тенетах не вказано «%s»"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "Пошук у _Тенетах"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "Відкрити як _посилання"
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "Вчора"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i днів тому"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 msgid "Jabber ID already in list"
 msgstr "Ідентифікатор Jabber вже є у списку"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 "Введений вами ідентифікатор Jabber вже є у списку. Оберіть якийсь інший."
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6613,126 +6680,126 @@ msgstr "Ім'я контакту"
 msgid "Set Mood"
 msgstr "Встановити настрій"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr "Повідомлення про стан %s"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "Повідомлення про стан"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 msgid "Overwrite Status Message?"
 msgstr "Перезаписати повідомлення про стан?"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Цю назву вже було використано. Бажаєте перезаписати повідомлення про стан?"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "Зберегти як стандартне повідомлення про стан"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "Будь ласка, введіть назву цього повідомлення про стан"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "Адреса AIM:"
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "Номер GG:"
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "Номер ICQ:"
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "Адреса MSN:"
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Адреса Yahoo!:"
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Будь ласка, вкажіть дані контакту, який ви бажаєте додати до облікового "
 "запису %s"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Будь ласка, вкажіть дані контакту, який ви бажаєте додати"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "Некоректний ідентифікатор користувача"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "У ідентифікаторі користувача не повинно міститися назви ресурсу."
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 msgid "You cannot add yourself to your roster."
 msgstr "Ви не можете додавати себе ж до реєстру."
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "Цей контакт вже є у реєстрі"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "Цей контакт уже є у вашому реєстрі."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "Ідентифікатор:"
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "Клієнт Jabber на GTK+"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "Поточні розробники:"
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "Колишні розробники:"
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "ПОДЯКИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Нарешті, але ані трохи не менше, ми вдячні всім супровідникам пакунків з "
 "програмою."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr "Raven's fans <translation@linux.org.ua>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6745,94 +6812,104 @@ msgstr ""
 "\n"
 "Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 msgid "The nickname has not allowed characters."
 msgstr "У псевдонімі є недозволені символи."
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запит на підписку до облікового запису %(account)s від %(jid)s"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запит на підписку від %s"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ви вже берете участь у груповій балачці %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Приєднатися до групової балачки з облікового запису %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "Некоректна назва облікового запису"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "Обліковий запис, з якого ви бажаєте увійти до кімнати"
+
+#: ../src/dialogs.py:2060
 msgid "Invalid Nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber групової балачки"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "У ідентифікаторі Jabber групової балачки містяться недозволені символи."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "Це не групова балачка"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не є назвою групової балачки."
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 "Для синхронізації ваших контактів потрібно встановити з’єднання облікового "
 "запису з сервером."
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 msgid "This account is not connected to the server"
 msgstr "Цей обліковий запис не з’єднано з сервером"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Можливістю синхронізації можна скористатися, лише якщо обліковий запис "
 "з’єднано з сервером."
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr "Синхронізувати"
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Почати балачку з облікового запису %s"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "Почати балачку"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6841,300 +6918,300 @@ msgstr ""
 "бажаєте надіслати повідомлення балачки:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "З’єднання недоступне"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "Некоректний JID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не вдалося обробити «%s»."
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "До встановлення з’єднання ви не зможете змінити ваш пароль."
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "Некоректний пароль"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "Вам слід ввести пароль."
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі, введені у обидва поля, мають бути тотожними."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Контакт увійшов до мережі"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Нове повідомлення"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Створити окреме повідомлення"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Нове конфіденційне повідомлення"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Нове повідомлення електронної пошти"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Запит на передавання файла"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Помилка під час передавання файла"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Завершення передавання файла"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Зупинка передавання файла"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Запрошення до групової балачки"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Зміна контактом стану"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Окреме повідомлення з використанням облікового запису %s"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Окреме повідомлення для облікового запису %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "Окреме повідомлення"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "Надіслати %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "Отримано %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, python-format
 msgid "Form %s"
 msgstr "Форма %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "Відповідь: %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написав(-ла):\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr "Консоль XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Я хочу додати вас до мого списку контактів."
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr ""
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "Смутний"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Я хочу додати вас до свого реєстру."
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Списки конфіденційності <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Порядок: %(order)s, дія: %(action)s, тип: %(type)s, значення: %(value)s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Порядок: %(order)s, дія: %(action)s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редагувати правило</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додати правило</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "Списки конфіденційності"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "Некоректна назва списку"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "Для створення списку конфіденційності вам слід ввести його назву."
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 msgid "You are invited to a groupchat"
 msgstr "Вас запрошено до групової балачки"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запросив вас до участі у обговоренні"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запросив вас до групової балачки %(room_jid)s"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr "Чи бажаєте ви прийняти це запрошення?"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "Обрати звук"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "Всі файли"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Звуки wav"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "Вибрати зображення"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "Зображення"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "Якщо %s стане рівним:"
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавання особливого сповіщення для %s"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "якщо я "
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7145,19 +7222,19 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання (SAS) цього сеансу є <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr "Ви вже перевіряли особу контакту."
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr "Особу контакту перевірено"
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr "Повторити перевірку..."
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7167,19 +7244,19 @@ msgstr ""
 "бажана особа, і що ця лише ця особа матиме змогу надсилати вам повідомлення, "
 "вам слід підтвердити їх ідентичність натисканням кнопки, розташованої нижче."
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr "Особу контакту НЕ перевірено"
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr "Перевірити..."
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr "Чи перевірили ви особу контакту?"
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7194,24 +7271,24 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання у цьому сеансі буде <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Ви зв’язалися з контактом і перевірили SAS?"
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Ключ контакту (%s) <b>не збігається</b> з ключем, призначеним для нього у "
 "Gajim."
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
@@ -7220,7 +7297,7 @@ msgstr ""
 "b>, отже повідомлення <b>не може</b> бути зашифрованим. Для того, щоб "
 "встановити надійність цього ключа, скористайтесь вашим клієнтом GPG."
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7316,20 +7393,20 @@ msgstr "Опис"
 msgid "Id"
 msgstr "Ідентифікатор"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "Закладку вже встановлено"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Закладка на груповій балачці «%s» вже існує."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "Закладку було успішно додано"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
@@ -7342,15 +7419,15 @@ msgstr "Підписано"
 msgid "Node"
 msgstr "Вузол"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "Нове повідомлення"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "_Підписатися"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "_Скасувати підписку"
 
@@ -7800,34 +7877,34 @@ msgstr "Для роботи Gajim потрібен запущений серве
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Для роботи Gajim потрібен PyGTK 2.8 або новіша версія"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Для запуску Gajim потрібен PyGTK 2.8 або новіша версія. Завершення роботи..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Для роботи Gajim потрібна бібліотека GTK 2.8 або новіша версія"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Для запуску Gajim потрібна бібліотека GTK 2.8 або новіша версія. Завершення "
 "роботи..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "У середовищі виконання GTK+ відсутня підтримка libglade"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7836,22 +7913,22 @@ msgstr ""
 "Будь ласка, вилучіть поточні бібліотеки GTK+ з системи і встановіть останню "
 "стабільну версію цих бібліотек, яку можна знайти за адресою %s"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Будь ласка, перевірте, чи увімкнено підтримку libglade у GTK+ і PyGTK на "
 "вашій системі."
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Для запуску Gajim потрібен PySQLite2"
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "Для роботи Gajim потрібен pywin32"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7861,11 +7938,11 @@ msgstr ""
 "Звантажити цю програму можна за адресою %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim вже запущено"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7873,35 +7950,35 @@ msgstr ""
 "Здається, вже запущено інший екземпляр Gajim.\n"
 "Запустити ще один екземпляр?"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "Слід вказати пароль"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введіть пароль ключа GPG для ключа %(keyid)s (account %(account)s)."
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr "Немає ключа GPG"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "З’єднання з %s буде встановлено без OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "Вказано помилковий пароль"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7912,58 +7989,58 @@ msgstr ""
 "використовує інший учасник.\n"
 "Будь ласка, вкажіть нижче інший псевдонім:"
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "Чи приймаєте ви цей запит?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) уповноваження для %(url)s (ідентифікатор: %(id)s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Помилка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "помилка під час надсилання %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 msgid "Subscription request"
 msgstr "Запит на підписку"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "Уповноваження прийнято"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» вилучив вашу підписку"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7971,77 +8048,77 @@ msgstr ""
 "Цей контакт завжди буде показано зі станом «поза мережею».\n"
 "Бажаєте вилучити контакт з вашого списку контактів?"
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 msgid "Unsubscribed"
 msgstr "_Непідписаний"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Зв’язок з «%s» встановити не вдалося"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s тепер стає %(new_nick)s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s тепер %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s встановив тему %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Всі учасники можуть бачити ваш JID повністю"
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Сталася зміна налаштувань кімнати, не пов’язана з конфіденційністю"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr "Тепер увімкнено запис повідомлень кімнати"
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr "Тепер запис кімнати вимкнено"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr "Тепер у кімнаті вимкнено анонімність"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr "Тепер у кімнаті увімкнено напіванонімність"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr "Тепер у кімнаті увімкнено анонімність"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -8049,19 +8126,24 @@ msgstr ""
 "Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено "
 "або цей агент повернув помилковий пароль.\n"
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Ви виконали з’єднання без вашого ключа OpenPGP."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "Ваш пароль не є коректним"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "Ваш пароль не є коректним"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr "GPG непридатне для використання"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -8069,13 +8151,14 @@ msgstr ""
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "Більше _не питати мене"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
@@ -8083,12 +8166,12 @@ msgstr ""
 "Gnome Keyring встановлено, але не \t\t\t\t\tзапущено належним чином "
 "(ймовірно, змінну середовища вказано \t\t\t\t\tнеправильно)"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нові повідомлення у %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8096,7 +8179,7 @@ msgstr[0] "Отримано %d новий лист"
 msgstr[1] "Отримано %d нових листи"
 msgstr[2] "Отримано %d нових листів"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8111,44 +8194,44 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s бажає надіслати вам файл."
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Вилучає контакт з реєстру"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "Помилка під час спроби прочитати файл:"
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Ви успішно отримали %(filename)s від %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Ви успішно надіслали %(filename)s до %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8157,38 +8240,38 @@ msgstr ""
 "Не вдалося розшифрувати повідомлення від %s\n"
 "Можливо, хтось втрутився у ваше з’єднання."
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 msgid "Unable to decrypt message"
 msgstr "Не вдалося розшифрувати повідомлення"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "Конфлікт імен користувачів"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr ""
 "Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
 "запису"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr "Гу?"
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Га! (%s s.)"
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr "Помилка."
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 msgid "Resource Conflict"
 msgstr "Конфлікт ресурсів"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8196,11 +8279,11 @@ msgstr ""
 "Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь "
 "ласка, вкажіть інший ресурс"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr "Помилка під час перевірки сертифіката SSL"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8211,15 +8294,15 @@ msgstr ""
 "помилка: %(error)s\n"
 "Ви все ще маєте намір з’єднатися з сервером?"
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr "Ігнорувати цю помилку для цього сертифіката."
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr "Помилка сертифіката SSL"
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8236,11 +8319,11 @@ msgstr ""
 "\n"
 "Ви все ще маєте намір з’єднатися і оновити відбиток сертифіката?"
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 msgid "Insecure connection"
 msgstr "Небезпечне з’єднання"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8248,11 +8331,11 @@ msgstr ""
 "Ви маєте намір надіслати ваш пароль нешифрованим з’єднанням. Виконати "
 "надсилання пароля?"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr "Так, я справді бажаю знехтувати безпекою"
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -8261,27 +8344,27 @@ msgstr ""
 "безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля "
 "зараз?"
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr "Вузол повідомлення про стан було вилучено"
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Вузол повідомлення про стан %(node)s було вилучено: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 msgid "Emoticons disabled"
 msgstr "Емоційки вимкнено"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -8291,13 +8374,13 @@ msgstr ""
 "формат файла emoticons.py. Докладніше про новий формат можна дізнатися за "
 "адресою http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Ви не можете приєднуватися до групової балачки зі станом «невидимий»"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "Не вдалося зберегти ваші налаштування і параметри"
 
@@ -8332,12 +8415,13 @@ msgstr ""
 "показано у окремому рядку"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "обліковий запис"
 
@@ -8362,9 +8446,9 @@ msgstr "стан"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "одне зі значень: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "повідомлення"
 
@@ -8382,25 +8466,50 @@ msgstr ""
 "позначено пункт «синхронізувати з загальним станом»"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Змінює стан облікового запису або обліковий запис"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "Пріорите_т:"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Я бажаю _зареєструвати новий обліковий запис"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"змінити стан облікового запису «account». Якщо назви облікового запису не "
+"вказано, спробувати змінити стан всіх облікових записів, для яких було "
+"позначено пункт «синхронізувати з загальним станом»"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Відкриває діалогове вікно балачки, за допомогою якого ви зможете надсилати "
 "повідомлення контакту"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакту, з яким ви бажаєте розпочати балачку"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "якщо вказано, контакт буде взято зі списку контактів цього облікового запису"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8411,29 +8520,29 @@ msgstr ""
 "лише 'account', без 'OpenPGP key', просто встановіть значення 'OpenPGP key' "
 "рівним ''."
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакту, який отримає це повідомлення"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "вміст повідомлення"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "ключ pgp"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "якщо вказано, повідомлення буде зашифровано відкритим ключем"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "якщо вказано, повідомлення буде надіслано з цього облікового запису"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8444,138 +8553,138 @@ msgstr ""
 "лише 'account', без 'OpenPGP key', просто встановіть значення 'OpenPGP key' "
 "рівним ''."
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "тема повідомлення"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Надсилає нове повідомлення до групової балачки, до якої ви приєдналися."
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 msgid "JID of the room that will receive the message"
 msgstr "JID кімнати, де буде отримано це повідомлення"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "JID контакту"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "Назва облікового запису"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "Надсилає контакту файл"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "Шлях до файла"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "якщо вказано, файл буде надіслано з цього облікового запису"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "Показує список всі параметрів та значення цих параметрів"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "Встановлює значення «ключ» у «значення»"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "ключ=значення"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "«ключ» — це назва параметра, «значення» — значення параметра"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "Вилучає запис параметра"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "назва параметра, який буде вилучено"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записує поточні значення параметрів Gajim до файла .config"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "Вилучає контакт з реєстру"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "Додає контакт до реєстру"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "Додає новий контакт до цього облікового запису"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Повертає поточний стан (загальний стан, якщо не було вказано облікового "
 "запису)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Повертає поточне повідомлення стану (загальне повідомлення, якщо не було "
 "вказано облікового запису)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 msgid "Returns number of unread messages"
 msgstr "Повертає кількість непрочитаних повідомлень"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "Відкриває діалогове вікно «Почати балачку»"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "Розпочати балачку з цього облікового запису"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "Надсилає нетиповий XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "XML для надсилання"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8583,72 +8692,72 @@ msgstr ""
 "Обліковий запис, на який буде надіслано xml; якщо не вказано, xml буде "
 "надіслано до всіх облікових записів"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr "Обробка xmpp:/ uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr "Адреса URI для обробки"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr "Обліковий запис, який має це обробляти"
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "вміст повідомлення"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 msgid "Join a MUC room"
 msgstr "Приєднатися до кімнати групової балачки"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "room"
 msgstr "кімната"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 msgid "Room JID"
 msgstr "JID кімнати"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "nick"
 msgstr "псевдонім"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 msgid "Nickname to use"
 msgstr "Псевдонім, який слід використовувати"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "password"
 msgstr "пароль"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 msgid "Password to enter the room"
 msgstr "Пароль для входу до кімнати"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr "Обліковий запис, з якого ви бажаєте увійти до кімнати"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 msgid "Check if Gajim is running"
 msgstr "Перевірити, чи запущено Gajim"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 msgid "Shows or hides the ipython window"
 msgstr "Показує або ховає вікно ipython"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущено аргумент «contact_jid»"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8657,16 +8766,16 @@ msgstr ""
 "«%s» немає у реєстрі.\n"
 "Будь ласка, вкажіть обліковий запис для надсилання цього повідомлення."
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "У вас немає жодного задіяного облікового запису"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Здається, Gajim не запущено. Отже ви не зможете скористатися gajim-remote."
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8675,16 +8784,16 @@ msgstr ""
 "Використання: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr "%s не знайдено"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8693,7 +8802,7 @@ msgstr ""
 "Використання: %s команда [аргументи]\n"
 "Можливі команди:\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8702,7 +8811,7 @@ msgstr ""
 "Забагато аргументів. \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8711,7 +8820,7 @@ msgstr ""
 "Не було вказано аргумент \"%(arg)s\". \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 msgid "Wrong uri"
 msgstr "Помилкова адреса uri"
 
@@ -8740,296 +8849,151 @@ msgstr "Ви не можете вилучати вашої поточної те
 msgid "Please first choose another for your current theme."
 msgstr "Будь ласка, спершу змініть тему на іншу."
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "Спроба надсилання конфіденційного повідомлення зазнала невдачі"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Ви полишили групову балачку «%(room)s» або це зробив (зробила) «%(nick)s»."
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Вставити псевдонім"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 msgid "Conversation with "
 msgstr "Спілкування з"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 msgid "Continued conversation"
 msgstr "Спілкування з продовженням"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr "Увімкнено запис кімнати"
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 msgid "A new room has been created"
 msgstr "Було створено нову кімнату"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер призначив вам псевдонім у кімнаті або змінив цей псевдонім"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s було викинуто: %(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s було викинуто %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s було заблоковано: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s було заблоковано %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ви тепер відомі як %s"
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 msgid "affiliation changed"
 msgstr "змінено місце роботи"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr "налаштування кімнати змінено на «лише для постійних учасників»"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr "вимкнення системи"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Належність %(nick)s було встановлено у значення %(affiliation)s %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Належність of %(nick)s було встановлено у значення %(affiliation)s"
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s %(actor)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr "%s вийшов"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s приєднався до групової балачки"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "Псевдоніма не знайдено: %s"
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "У цієї групової балачки немає певної теми"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "%(contact_jid)s запрошено до %(room_jid)s."
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "Псевдоніма не знайдено: %s"
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"Використання: /%s <псевдонім|JID> [причина], заблокувати JID у груповій "
-"балачці. Може бути виконано заміну псевдоніма учасника, але лише, якщо цей "
-"псевдонім не містить символів «@». Якщо особа з вказаним JID все ще бере "
-"участь у груповій балачці, її буде викинуто з балачки. Пробіли у псевдонімі "
-"НЕ підтримуються."
-
-#: ../src/groupchat_control.py:1734
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr ""
-"Використання: /%s <nickname>, відкрити вікно конфіденційної балачки з "
-"вказаним учасником."
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr ""
-"Використання: /%s [причина], закрити поточне вікно або вкладку з показом "
-"причини, якщо таку вказано."
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr ""
-"Використання: /%s <JID> [причина], запросити JID до групової балачки з "
-"необов’язковим зазначенням причини."
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr ""
-"Використання: /%s <кімната>@<сервер>[/псевдонім], приєднатися до кімнати на "
-"сервері з необов’язковим вказаним псевдонімом."
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"Використання: /%s <псевдонім> [причина], вилучити учасника з вказаним "
-"псевдонімом з групової балачки з необов’язковим зазначенням причини. Пробіли "
-"у псевдонімах НЕ підтримуються."
-
-#: ../src/groupchat_control.py:1762
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"Використання: /%s <nickname> [message], відкрити вікно конфіденційного "
-"повідомлення і надіслати це повідомлення учаснику з вказаним псевдонімом."
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr ""
-"Використання: /%s <псевдонім>, змінити ваш псевдонім у поточній груповій "
-"балачці."
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Використання: /%s , показати імена учасників групової балачки."
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr ""
-"Використання: /%s [тема], показати або оновити поточну тему групової балачки."
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr ""
-"Використання: /%s <message>, надіслати повідомлення без використання інших "
-"команд."
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr ""
-"Використання: /%s <псевдонім>, змінити ваш псевдонім у поточній груповій "
-"балачці."
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки."
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "Зміна теми"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "Будь ласка, вкажіть нову тему:"
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "Зміна псевдоніма"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "Будь ласка, вкажіть новий псевдонім, яким ви бажаєте скористатися:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, python-format
 msgid "Destroying %s"
 msgstr "Знищення %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9037,22 +9001,22 @@ msgstr ""
 "Ви маєте намір знищити цю кімнату.\n"
 "Нижче ви можете вказати причину цього рішення:"
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "Викидання %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "Нижче ви можете зазначити причину:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "Блокування %s"
@@ -9126,6 +9090,14 @@ msgstr ""
 msgid "Save Image as..."
 msgstr "Зберегти зображення як..."
 
+#: ../src/gui_menu_builder.py:89
+msgid "_New Group Chat"
+msgstr "_Створити групову балачку"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "Я хочу додати вас до свого реєстру"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Не можу знайти базу даних журналу"
@@ -9211,52 +9183,62 @@ msgstr "Журнал спілкування з %s"
 msgid "Disk Error"
 msgstr "Помилка роботи з диском"
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s тепер %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "Повідомлення про помилку: %s"
+
+#: ../src/history_window.py:440
+#, fuzzy
+msgid "Error"
+msgstr "Помилка."
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Поточний стан: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Поточний стан: %(status)s"
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 msgid "Timeout loading image"
 msgstr "Перевищення часу очікування під час завантаження зображення"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr "Зображення є завеликим"
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ви справді бажаєте вилучити виділене повідомлення?"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "Балачки"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "Групові балачки"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "Конфіденційні балачки"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "Повідомлення"
 
@@ -9316,18 +9298,18 @@ msgstr "_Ігнорувати"
 msgid "Retrieving profile..."
 msgstr "Отримання профілю..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 msgid "File is empty"
 msgstr "Файл порожній"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 msgid "File does not exist"
 msgstr "Файла не існує"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "Не вдалося завантажити зображення"
 
@@ -9360,46 +9342,46 @@ msgid ""
 msgstr ""
 "Під час спроби оприлюднення ваших особистих відомостей, спробуйте пізніше."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "Об’єднані облікові записи"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "Було надіслано уповноваження"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Тепер «%s» буде відомий ваш стан."
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "Було надіслано запит на підписку"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеся про його або її стан."
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "Уповноваження було вилучено"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Тепер «%s» завжди бачитиме вас як «поза мережею»."
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr "GPG непридатне для використання"
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "Ви берете участь у одній або декількох групових балачках"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9407,28 +9389,28 @@ msgstr ""
 "Зміна стану на «невидимий» призведе до вашого виходу з наведених групових "
 "балачок. Ви справді бажаєте змінити стан на «невидимий»?"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr "розсинхронізація"
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "У вас є непрочитані повідомлення"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9436,16 +9418,16 @@ msgstr ""
 "Доступ для читання повідомлень буде можливим, лише якщо ви увімкнули журнал, "
 "а контакт наявний у вашому реєстрі."
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "Вам слід прочитати їх, перш ніж вилучати цей транспорт."
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" буде вилучено"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9453,11 +9435,11 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цього транспорту."
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "Транспорти буде вилучено"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9466,57 +9448,68 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цих транспортів: %s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "Перейменувати контакт"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введіть новий псевдонім для контакту %s"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "Перейменувати групу"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введіть нову назву для групи %s"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "Вилучити групу"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Бажаєте вилучити групу %s з реєстру?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Крім того, вилучити всі контакти з цієї групи з вашого реєстру"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "Призначити ключ OpenPGP"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "Оберіть ключ для використання з цим контактом"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Ви збираєтесь вилучити \"%(name)s\" (%(jid)s) з вашого реєстру.\n"
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9525,11 +9518,11 @@ msgstr ""
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити виконання операції?"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9537,16 +9530,16 @@ msgstr ""
 "Вилучення цього контакту призведе до вилучення уповноваження, отже він або "
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, щоб цей контакт знав про мій стан після вилучення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9556,21 +9549,34 @@ msgstr ""
 "призведе до вилучення уповноваження, отже для них ви завжди залишатиметеся "
 "поза мережею."
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "Немає жодного облікового запису"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Перш ніж ви зможете розпочати балачку з контактами, вам слід створити "
 "обліковий запис."
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "Збереження метаконтактів не підтримується вашим сервером"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9578,12 +9584,12 @@ msgstr ""
 "Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці "
 "відомості не буде збережено до наступного з’єднання."
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9593,11 +9599,11 @@ msgstr ""
 "списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом "
 "є особа з декількома обліковими записами або транспортами Jabber."
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 msgid "Invalid file URI:"
 msgstr "Некоректна адреса файла:"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9605,12 +9611,12 @@ msgstr[0] "Ви справді бажаєте надіслати цей файл
 msgstr[1] "Ви справді бажаєте надіслати ці файли до %s:"
 msgstr[2] "Ви справді бажаєте надіслати ці файли до %s:"
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Надіслати %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Надсилає контакту файл"
@@ -9620,115 +9626,127 @@ msgstr "Надсилає контакту файл"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "з облікового запису %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "до облікового запису %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "з облікового запису %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Керування закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "облікового запису %s"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "до облікового запису %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "_Змінити повідомлення про стан"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 msgid "Publish Tune"
 msgstr "Оприлюднити музику"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 msgid "Configure Services..."
 msgstr "Налаштувати служби..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr "_Максимізувати всі"
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "Надіслати групове п_овідомлення"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "Усім користувачам"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "Усім користувачам на зв'язку"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "Я хочу додати вас до свого реєстру"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 msgid "_Manage Contacts"
 msgstr "_Керування контактами"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "Редагувати _групи"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 msgid "Send Single Message"
 msgstr "Надіслати окреме повідомлення"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "Виконати команду..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 msgid "_Manage Transport"
 msgstr "_Керування транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 msgid "_Modify Transport"
 msgstr "_Змінити транспорт"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "Пере_йменувати"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr "_Максимізувати"
 
-#: ../src/roster_window.py:5914
-msgid "_Disconnect"
+#: ../src/roster_window.py:5631
+#, fuzzy
+msgid "_Reconnect"
 msgstr "_Роз'єднати"
 
-#: ../src/roster_window.py:5994
-msgid "_New Group Chat"
-msgstr "_Створити групову балачку"
+#: ../src/roster_window.py:5637
+msgid "_Disconnect"
+msgstr "_Роз'єднати"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "Керування журналом"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "_Приєднатись до нової групової балачки"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "Змінити повідомлення про стан..."
 
@@ -9745,20 +9763,20 @@ msgstr "Помилка у отриманих даних"
 msgid "No result"
 msgstr "Результату немає"
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr "Помилка під час запису на диск"
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr "Підтвердити параметри цих сеансів"
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9773,7 +9791,7 @@ msgstr ""
 "\n"
 "\tЧи всі вказані параметри є прийнятними?"
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9968,6 +9986,141 @@ msgstr "У черзі немає запитів на підписку."
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "Додати спеціальне _сповіщення"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "Призначити ключ Open_PGP"
+
+#~ msgid "Command not supported for zeroconf account."
+#~ msgstr "Ця команда не підтримується для облікового запису zeroconf."
+
+#~ msgid "Commands: %s"
+#~ msgstr "Команди:·%s"
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "Використання: /%s, спорожнить вміст текстового вікна."
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "Використання: /%s, сховає кнопки балачки."
+
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "Використання: /%(command)s <action>, надішле повідомлення про заняття до "
+#~ "поточної групової балачки. Буде використано третю особу. (наприклад, /%"
+#~ "(command)s впав під стілець.)"
+
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "Використання: /%s, надсилає луна-імпульс (пінг) контактові"
+
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "Використання: /%s, надсилає повідомлення контакту"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "Довідки для команди /%s не знайдено"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "Увімкнути обмін повідомленнями link-local/zeroconf"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "Псевдоніма не знайдено: %s"
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "У цієї групової балачки немає певної теми"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "%(contact_jid)s запрошено до %(room_jid)s."
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "Псевдоніма не знайдено: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "Використання: /%s <псевдонім|JID> [причина], заблокувати JID у груповій "
+#~ "балачці. Може бути виконано заміну псевдоніма учасника, але лише, якщо "
+#~ "цей псевдонім не містить символів «@». Якщо особа з вказаним JID все ще "
+#~ "бере участь у груповій балачці, її буде викинуто з балачки. Пробіли у "
+#~ "псевдонімі НЕ підтримуються."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr ""
+#~ "Використання: /%s <nickname>, відкрити вікно конфіденційної балачки з "
+#~ "вказаним учасником."
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr ""
+#~ "Використання: /%s [причина], закрити поточне вікно або вкладку з показом "
+#~ "причини, якщо таку вказано."
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr ""
+#~ "Використання: /%s <JID> [причина], запросити JID до групової балачки з "
+#~ "необов’язковим зазначенням причини."
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr ""
+#~ "Використання: /%s <кімната>@<сервер>[/псевдонім], приєднатися до кімнати "
+#~ "на сервері з необов’язковим вказаним псевдонімом."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "Використання: /%s <псевдонім> [причина], вилучити учасника з вказаним "
+#~ "псевдонімом з групової балачки з необов’язковим зазначенням причини. "
+#~ "Пробіли у псевдонімах НЕ підтримуються."
+
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "Використання: /%s <nickname> [message], відкрити вікно конфіденційного "
+#~ "повідомлення і надіслати це повідомлення учаснику з вказаним псевдонімом."
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr ""
+#~ "Використання: /%s <псевдонім>, змінити ваш псевдонім у поточній груповій "
+#~ "балачці."
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "Використання: /%s , показати імена учасників групової балачки."
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr ""
+#~ "Використання: /%s [тема], показати або оновити поточну тему групової "
+#~ "балачки."
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr ""
+#~ "Використання: /%s <message>, надіслати повідомлення без використання "
+#~ "інших команд."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr ""
+#~ "Використання: /%s <псевдонім>, змінити ваш псевдонім у поточній груповій "
+#~ "балачці."
+
 #~ msgid "B_OSH Port:"
 #~ msgstr "П_орт BOSH:"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 75053aab9..7b41848b6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"POT-Creation-Date: 2009-10-28 22:17+0100\n"
 "PO-Revision-Date: 2009-08-20 00:07+0200\n"
 "Last-Translator: kangkang <kanger@gmail.com>\n"
 "Language-Team: sIyU <jabber@lzusiyu.org>\n"
@@ -223,6 +223,7 @@ msgstr "<b>个人信息</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
 #: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:1
 msgid "Account"
 msgstr "账户"
 
@@ -289,8 +290,8 @@ msgstr "编辑个人信息..."
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
-#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
 #: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
@@ -301,8 +302,8 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
-#: ../src/roster_window.py:5277
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
+#: ../src/roster_window.py:5351
 msgid "General"
 msgstr "常规"
 
@@ -356,25 +357,21 @@ msgid "Information about you, as stored in the server"
 msgstr "服务器中保存的关于您的信息"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
-#: ../src/config.py:2092
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
+#: ../src/config.py:2131
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
 #. None means no proxy profile selected
-#. boshuseproxy_checkbutton.set_active(False)
-#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
-#. useauth_checkbutton.set_active(False)
-#. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
-#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
-#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
-#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
+#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
+#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
+#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
+#: ../src/roster_window.py:2818
 msgid "None"
 msgstr "无"
 
@@ -530,8 +527,8 @@ msgstr ""
 "您可以考虑下改变现在的防火墙设置。"
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
-#: ../src/dialogs.py:784
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
+#: ../src/dialogs.py:806
 msgid "Jabber ID:"
 msgstr "Jabber ID"
 
@@ -545,7 +542,7 @@ msgid "Mer_ge accounts"
 msgstr "合并帐户(_G)"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
 msgid "Re_name"
 msgstr "重命名(_N)"
 
@@ -813,7 +810,7 @@ msgid "All statuses"
 msgstr "所有状态"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:214
+#: ../src/common/commands.py:101 ../src/common/helpers.py:219
 msgid "Away"
 msgstr "离开"
 
@@ -830,7 +827,7 @@ msgid "Have "
 msgstr "有"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:229
 msgid "Invisible"
 msgstr "隐身"
 
@@ -839,7 +836,7 @@ msgid "Launch a command"
 msgstr "启动命令"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:202
 msgid "Not Available"
 msgstr "不可用"
 
@@ -1035,7 +1032,7 @@ msgid "Join _Group Chat"
 msgstr "加入群聊(_G)"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Add to Roster..."
 msgstr "添加至名单(_A)"
@@ -1062,65 +1059,154 @@ msgstr "在浏览器中打开连接(_O)"
 msgid "_Start Chat"
 msgstr "开始聊天(_S)"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:1
+#: ../data/glade/chat_to_muc_window.glade.h:1
+#, fuzzy
+msgid "In_vite"
+msgstr "邀请到(_V)"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends!"
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "旁观者"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr ""
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "要求查看他/她的状态(_S)"
+
+#: ../data/glade/contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "添加特殊提示(_N)"
+
+#: ../data/glade/contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "指定 Open_PGP 密钥"
+
+#: ../data/glade/contact_context_menu.glade.h:4
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "运行命令..."
+
+#: ../data/glade/contact_context_menu.glade.h:5
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "编辑群组"
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
+#: ../src/roster_window.py:5412
+msgid "In_vite to"
+msgstr "邀请到(_V)"
+
+#: ../data/glade/contact_context_menu.glade.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "联系人"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/gc_occupants_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
+#: ../data/glade/contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "移除(_R)"
+
+#. Send Custom Status
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
+#: ../src/roster_window.py:5497
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "发送自定义 XML"
+
+#: ../data/glade/contact_context_menu.glade.h:10
+msgid "Send Single _Message..."
+msgstr "发送一条消息...(_M)"
+
+#: ../data/glade/contact_context_menu.glade.h:11
+#, fuzzy
+msgid "Send _File..."
 msgstr "发送文件(_F)"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:12
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:13
+msgid "Start _Chat"
+msgstr "开始群聊(_C)"
+
+#: ../data/glade/contact_context_menu.glade.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "绑定 OpenPGP 加密 (_P)"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/contact_context_menu.glade.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "绑定 OpenPGP 加密 (_P)"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "添加至名单(_A)"
+#: ../data/glade/contact_context_menu.glade.h:17
+msgid "_Allow him/her to see my status"
+msgstr "允许他/她查看我的状态(_A)"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/contact_context_menu.glade.h:18
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
+#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/contact_context_menu.glade.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "禁止他/她查看我的状态(_F)"
+
+#: ../data/glade/contact_context_menu.glade.h:20
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:21
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5924
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
 msgid "_History"
 msgstr "历史(_H)"
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "邀请到(_V)"
-
-#: ../data/glade/chat_to_muc_window.glade.h:2
-msgid "Invite Friends!"
+#: ../data/glade/contact_context_menu.glade.h:21
+msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/glade/contact_context_menu.glade.h:22
 #, fuzzy
-msgid "MUC server"
-msgstr "旁观者"
+msgid "_Manage Contact"
+msgstr "重命名联系人"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
-msgid "Please select a MUC server."
-msgstr ""
+#: ../data/glade/contact_context_menu.glade.h:23
+#, fuzzy
+msgid "_Rename..."
+msgstr "重命名(_R)"
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+#: ../data/glade/contact_context_menu.glade.h:24
+msgid "_Subscription"
+msgstr "认证(_S)"
+
+#: ../data/glade/contact_context_menu.glade.h:25
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
+#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+msgid "_Unblock"
 msgstr ""
 
+#: ../data/glade/contact_context_menu.glade.h:26
+#, fuzzy
+msgid "_Unignore"
+msgstr "九"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "填写表格。"
@@ -1239,7 +1325,7 @@ msgstr ""
 "联系人栏\n"
 "聊天条"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
 msgid "Bold"
 msgstr "粗体"
 
@@ -1263,7 +1349,7 @@ msgstr "已离开"
 msgid "Inactive"
 msgstr "未活动的"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
 msgid "Italic"
 msgstr "斜体"
 
@@ -1341,6 +1427,14 @@ msgstr "仲裁人(_D)"
 msgid "Occupant Actions"
 msgstr "房主动作(_O)"
 
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "Send _File"
+msgstr "发送文件(_F)"
+
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "添加至名单(_A)"
+
 #: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "管理(_A)"
@@ -1349,13 +1443,6 @@ msgstr "管理(_A)"
 msgid "_Ban"
 msgstr "封禁(_B)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
-#: ../src/roster_window.py:5862
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "踢除(_K)"
@@ -1372,13 +1459,6 @@ msgstr "拥有人(_O)"
 msgid "_Send Private Message"
 msgstr "发送私聊消息(_S)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
-#: ../src/roster_window.py:5859
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "语音(_V)"
@@ -1388,7 +1468,7 @@ msgstr "语音(_V)"
 msgid "Create new post"
 msgstr "新发表"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
 msgid "From"
 msgstr "来自"
 
@@ -1418,8 +1498,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim 历史记录管理器"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
-#: ../src/dialogs.py:2908
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
+#: ../src/dialogs.py:2987
 msgid "Delete"
 msgstr "删除"
 
@@ -1465,35 +1545,40 @@ msgstr "查找"
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
+#: ../data/glade/join_groupchat_window.glade.h:2
+#, fuzzy
+msgid "Bookmark this room"
+msgstr "将本房间加入书签(_B)"
+
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/join_groupchat_window.glade.h:4
 #, fuzzy
 msgid "Join this room automatically when I connect"
 msgstr "当连接上时设置我的模版"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/join_groupchat_window.glade.h:5
 #: ../data/glade/manage_bookmarks_window.glade.h:5
 msgid "Nickname:"
 msgstr "昵称："
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "密码："
 
-#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/join_groupchat_window.glade.h:7
 msgid "Recently:"
 msgstr "最近："
 
-#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/join_groupchat_window.glade.h:8
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "房间："
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
 #: ../src/disco.py:1628
 msgid "_Join"
 msgstr "加入(_J)"
@@ -1522,7 +1607,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "打印状态："
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
 msgid "Server:"
 msgstr "服务器："
 
@@ -2053,7 +2138,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "按状态分类联系人(_S)"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
 msgid "Status"
 msgstr "状态"
 
@@ -2226,34 +2311,39 @@ msgid "All"
 msgstr "全部"
 
 #: ../data/glade/privacy_list_window.glade.h:7
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "所有认证的"
+
+#: ../data/glade/privacy_list_window.glade.h:8
 msgid "Allow"
 msgstr "允许"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/glade/privacy_list_window.glade.h:9
 msgid "Deny"
 msgstr "拒绝"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/glade/privacy_list_window.glade.h:10
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/glade/privacy_list_window.glade.h:11
 msgid "Order:"
 msgstr "订阅："
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
 msgid "Privacy List"
 msgstr "私人列表"
 
-#: ../data/glade/privacy_list_window.glade.h:12
+#: ../data/glade/privacy_list_window.glade.h:13
 msgid "all by subscription"
 msgstr "所有认证的"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/glade/privacy_list_window.glade.h:14
 msgid "all in the group"
 msgstr "群组内所有"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/glade/privacy_list_window.glade.h:15
 msgid ""
 "none\n"
 "both\n"
@@ -2265,19 +2355,19 @@ msgstr ""
 "从\n"
 "到"
 
-#: ../data/glade/privacy_list_window.glade.h:18
+#: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me messages"
 msgstr "向我发送消息"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me queries"
 msgstr "向我发送查询"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/glade/privacy_list_window.glade.h:21
 msgid "to send me status"
 msgstr "向我发送状态"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/glade/privacy_list_window.glade.h:22
 msgid "to view my status"
 msgstr "查看我的状态"
 
@@ -2469,105 +2559,11 @@ msgstr "同时从 Gajim 和服务器移除帐户(_S)"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
-#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
+#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:1
-msgid "A_sk to see his/her status"
-msgstr "要求查看他/她的状态(_S)"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:2
-#, fuzzy
-msgid "Add Special _Notification..."
-msgstr "添加特殊提示(_N)"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:3
-#, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "指定 Open_PGP 密钥"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:4
-#, fuzzy
-msgid "Edit _Groups..."
-msgstr "编辑群组"
-
-#. Execute Command
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5815
-msgid "Execute Command..."
-msgstr "运行命令..."
-
-#. Invite to
-#. Invite to Groupchat
-#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
-msgid "In_vite to"
-msgstr "邀请到(_V)"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "Remo_ve"
-msgstr "移除(_R)"
-
-#. Send Custom Status
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
-#, fuzzy
-msgid "Send Cus_tom Status"
-msgstr "发送自定义 XML"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send Single _Message..."
-msgstr "发送一条消息...(_M)"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-#, fuzzy
-msgid "Send _File..."
-msgstr "发送文件(_F)"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "Set Custom _Avatar..."
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
-msgid "Start _Chat"
-msgstr "开始群聊(_C)"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-msgid "_Allow him/her to see my status"
-msgstr "允许他/她查看我的状态(_A)"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-msgid "_Forbid him/her to see my status"
-msgstr "禁止他/她查看我的状态(_F)"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:18
-msgid "_Ignore"
-msgstr ""
-
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Contact"
-msgstr "重命名联系人"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:20
-#, fuzzy
-msgid "_Rename..."
-msgstr "重命名(_R)"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:21
-msgid "_Subscription"
-msgstr "认证(_S)"
-
-#: ../data/glade/roster_contact_context_menu.glade.h:23
-#, fuzzy
-msgid "_Unignore"
-msgstr "九"
-
 #: ../data/glade/roster_item_exchange_window.glade.h:1
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
@@ -2695,7 +2691,7 @@ msgid "_Add contact"
 msgstr "添加联系人(_C)"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
 #, fuzzy
 msgid "_Information"
 msgstr "联系人信息"
@@ -2921,26 +2917,6 @@ msgstr "消息(_M)"
 msgid "_Presence"
 msgstr "在场(_P)"
 
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "添加特殊提示(_N)"
-
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "指定 Open_PGP 密钥"
-
-#. Edit Groups
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5716
-msgid "Edit _Groups"
-msgstr "编辑群组"
-
-#. Rename
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5842
-msgid "_Rename"
-msgstr "重命名(_R)"
-
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "修改帐户(_M)..."
@@ -2985,51 +2961,51 @@ msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Activated"
 msgstr "活动"
 
-#: ../src/advanced.py:97
+#: ../src/advanced_configuration_window.py:89
 #, fuzzy
 msgid "Deactivated"
 msgstr "未活动的"
 
-#: ../src/advanced.py:99
+#: ../src/advanced_configuration_window.py:91
 msgid "Boolean"
 msgstr ""
 
-#: ../src/advanced.py:100
+#: ../src/advanced_configuration_window.py:92
 #, fuzzy
 msgid "Integer"
 msgstr "群组内"
 
-#: ../src/advanced.py:101
+#: ../src/advanced_configuration_window.py:93
 msgid "Text"
 msgstr "文本"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:790
+#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
 msgid "Color"
 msgstr ""
 
-#: ../src/advanced.py:113
+#: ../src/advanced_configuration_window.py:105
 msgid "Preference Name"
 msgstr "优先名称"
 
-#: ../src/advanced.py:119
+#: ../src/advanced_configuration_window.py:111
 msgid "Value"
 msgstr "值"
 
-#: ../src/advanced.py:127
+#: ../src/advanced_configuration_window.py:119
 msgid "Type"
 msgstr "类型"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:180
+#: ../src/advanced_configuration_window.py:172
 msgid "(None)"
 msgstr "(无)"
 
-#: ../src/advanced.py:263
+#: ../src/advanced_configuration_window.py:255
 msgid "Hidden"
 msgstr "隐藏"
 
@@ -3043,257 +3019,256 @@ msgstr ""
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Belarusian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "British"
 msgstr "Briton"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Norvegian b"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Norwegian"
 msgstr "Norvegian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 #, fuzzy
 msgid "Serbian"
 msgstr "German"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:65
+#: ../src/chat_control.py:74
 msgid "Chinese (Ch)"
 msgstr "中文"
 
-#: ../src/chat_control.py:361
+#: ../src/chat_control.py:426
 msgid "Spelling language"
 msgstr "拼写检查"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:577
+#: ../src/chat_control.py:454 ../src/chat_control.py:642
 msgid "A connection is not available"
 msgstr "连接不可用"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:578
+#: ../src/chat_control.py:455 ../src/chat_control.py:643
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:772
+#: ../src/chat_control.py:820
 #, fuzzy
 msgid "Underline"
 msgstr "下划线"
 
-#: ../src/chat_control.py:773
+#: ../src/chat_control.py:821
 #, fuzzy
 msgid "Strike"
 msgstr "昵称"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Font"
 msgstr "字号：(_F)"
 
-#: ../src/chat_control.py:805
+#: ../src/chat_control.py:853
 #, fuzzy
 msgid "Clear formating"
 msgstr "联系人信息"
 
-#: ../src/chat_control.py:877
+#: ../src/chat_control.py:925
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:878
+#: ../src/chat_control.py:926
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
+#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "启用加密"
 
 #. Add to roster
-#. add_to_roster_menuitem
-#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
-#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
-#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
-#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
-#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
-#: ../src/roster_window.py:5562
+#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
+#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
+#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
+#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
+#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
+#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
+#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
+#: ../src/roster_window.py:3213
 msgid "Not in Roster"
 msgstr "不在名单中"
 
-#: ../src/chat_control.py:1310
+#: ../src/chat_control.py:1359
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "文件发送、完成和中止的清单"
 
-#: ../src/chat_control.py:1313
+#: ../src/chat_control.py:1362
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:626
+#: ../src/chat_control.py:1469 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:631
+#: ../src/chat_control.py:1471 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1424 ../src/tooltips.py:636
+#: ../src/chat_control.py:1473 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1427 ../src/tooltips.py:638
+#: ../src/chat_control.py:1476 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1613
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "群聊 %(room_name)s 的 %(nickname)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
+#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1699
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1708
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "禁用加密"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1734
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1674
+#: ../src/chat_control.py:1736
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1750
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1690
+#: ../src/chat_control.py:1752
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1694
+#: ../src/chat_control.py:1756
 #, fuzzy
 msgid "and authenticated"
 msgstr "使用验证"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1698
+#: ../src/chat_control.py:1760
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "使用验证"
@@ -3301,121 +3276,79 @@ msgstr "使用验证"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:1766
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1752
-msgid "Command not supported for zeroconf account."
-msgstr ""
-
-#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
-#, python-format
-msgid "Commands: %s"
-msgstr "命令： %s "
-
-#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "用法：/%s，清除文本窗口。"
-
-#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "用法：/%s，隐藏聊天按钮。"
-
-#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
-#, fuzzy, python-format
-msgid ""
-"Usage: /%(command)s <action>, sends action to the current group chat. Use "
-"third person. (e.g. /%(command)s explodes.)"
-msgstr ""
-"用法：/%s <动作>，发送动作到当前群聊。使用第三人称。(例如：/%s exploeds)"
-
-#: ../src/chat_control.py:1777
-#, fuzzy, python-format
-msgid "Usage: /%s, sends a ping to the contact"
-msgstr "用法：/%s，设置群聊窗口为紧凑模式。"
-
-#: ../src/chat_control.py:1780
-#, fuzzy, python-format
-msgid "Usage: /%s, send the message to the contact"
-msgstr "用法：/%s，隐藏聊天按钮。"
-
-#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
-#, python-format
-msgid "No help info for /%s"
-msgstr "没有 /%s 的帮助信息"
-
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1906
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1913
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[本条消息已加密]"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1916
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1926
+#: ../src/chat_control.py:1918
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1923
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1925
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "禁用加密"
 
-#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
+#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[本条消息已加密]"
 
-#: ../src/chat_control.py:1973
+#: ../src/chat_control.py:1965
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[本条消息已加密]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2354
+#: ../src/chat_control.py:2235
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "收到一条来自 “%s” 的消息"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:2236
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
-#: ../src/common/connection_handlers.py:2118
-#: ../src/common/connection_handlers.py:2313
-#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
-#: ../src/gajim.py:154 ../src/session.py:125
+#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
+#: ../src/gajim.py:154 ../src/session.py:130
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2511
+#: ../src/chat_control.py:2392
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2741
+#: ../src/chat_control.py:2622
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
@@ -3424,23 +3357,23 @@ msgstr "%(nick)s 的状态是 %(status)s"
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
-#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
-#: ../src/common/check_paths.py:145
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 应为文件但它应为一个目录"
 
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
 msgid "Gajim will now exit"
 msgstr "Gajim 即将退出"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:154
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 应为文件但它是一个目录"
 
-#: ../src/common/check_paths.py:169
+#: ../src/common/check_paths.py:170
 #, python-format
 msgid "creating %s directory"
 msgstr "正在建立 %s 目录"
@@ -3512,9 +3445,9 @@ msgstr ""
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:807
-#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
-#: ../src/roster_window.py:5153
+#: ../src/common/helpers.py:55 ../src/roster_window.py:812
+#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
+#: ../src/roster_window.py:5227
 #, fuzzy
 msgid "Groupchats"
 msgstr "群聊"
@@ -3533,70 +3466,111 @@ msgstr " %d 条未读消息 "
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "使用 D-Bus 和通知进程显示通知"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "转换状态为“离开”之前的时间(分钟)。"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "发呆导致的离开"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "转换状态为“不可用”之前的时间(分钟)"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "发呆导致的不可用"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:93
+#, fuzzy
+msgid "Incoming nickname color."
+msgstr "无效用户名"
+
+#: ../src/common/config.py:94
+msgid "Outgoing nickname color."
+msgstr ""
+
+#: ../src/common/config.py:95
+msgid "Incoming text color."
+msgstr ""
+
+#: ../src/common/config.py:96
+msgid "Outgoing text color."
+msgstr ""
+
+#: ../src/common/config.py:97
+#, fuzzy
+msgid "Status message text color."
+msgstr "状态消息文本"
+
+#: ../src/common/config.py:100
+#, fuzzy
+msgid "Incoming nickname font."
+msgstr "无效用户名"
+
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Outgoing nickname font."
+msgstr "正在更换昵称"
+
+#: ../src/common/config.py:102
+msgid "Incoming text font."
+msgstr ""
+
+#: ../src/common/config.py:103
+msgid "Outgoing text font."
+msgstr ""
+
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "Status message text font."
+msgstr "状态消息文本"
+
+#: ../src/common/config.py:105
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "折叠的列(账户和组)的列表(空格分隔)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:469
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
-#: ../src/common/optparser.py:482 ../src/gajim.py:3300
+#: ../src/common/config.py:106 ../src/common/config.py:483
+#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
+#: ../src/common/optparser.py:497 ../src/gajim.py:3471
 #, fuzzy
 msgid "default"
 msgstr "默认"
 
-#: ../src/common/config.py:104
-msgid "Enable link-local/zeroconf messaging"
-msgstr "允许本地连接/ ZeroConf 消息"
-
-#: ../src/common/config.py:107
+#: ../src/common/config.py:112
 msgid "Language used by speller"
 msgstr "拼写检查的语言"
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:113
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3606,7 +3580,7 @@ msgstr ""
 "'有时' - 如 iChat 风格每隔几分钟打印时间。\n"
 "'从不' - 从不打印时间。"
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:114
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -3616,16 +3590,16 @@ msgstr ""
 "使用模糊时钟打印时间。模糊度的值从 1 到 4，或者 0 禁用模糊时钟。1 是最精确的"
 "时钟，4 是最不精确的。只在打印时间为 '有时' 时生效。"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "如可能对 * / _ 格式化字串。"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:118
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果为真，不要移除 */_。所以 *abc* 将被加粗但 * * 不会被移除"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:121
 #, fuzzy
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
@@ -3635,58 +3609,72 @@ msgstr ""
 "为 HTML 使用重构文本标记，如果选择加入 ASCII 格式。(如果您想使用此功能，请安"
 "装 docutils)"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:130
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "当在群聊中使用昵称补全时加到昵称后的字母"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:131
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr "当请求的昵称被群聊中的其他人使用时要加到被请求的昵称后的字母。"
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:159
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:161
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:165
 msgid "Add * and [n] in roster title?"
 msgstr "加入 * 和 [n] 在名单标题？"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:166
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr "聊天标签/窗口被重新打开时显示的历史谈话行数"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "距上次谈话结束的分钟数"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:168
+msgid "How many lines to request to server when entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:169
+msgid "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+
+#: ../src/common/config.py:170
+msgid ""
+"How many seconds to wait before trying to autorejoin to a conference you are "
+"being disconnected from. Set to 0 to disable autorejoining."
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "用 Ctrl+回车 发行消息，回车开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ctrl+上箭头 存储行数。"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:177
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3694,11 +3682,11 @@ msgid ""
 msgstr ""
 "自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果选中，Gajim 可以接受 gajim-remote 远程控制。"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:181
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3708,73 +3696,73 @@ msgstr ""
 "如果为真，监听 NetworkManager 和状态改变(被没有监听网络管理器设置为假和它们使"
 "用全局状态同步提供)的基于网络连接的 D-Bus 信号。"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:182
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "发送聊天状态通知。可以是全部，打字，禁用中的一个。"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:183
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr "在聊天窗口中显示聊天状态通知。可以是全部，打字，禁用中的一个。"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:185
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr "当不是每条消息打印时间(打印时间为有时)时，每几分钟打印它。"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "关闭群聊标签/窗口前询问。"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:187
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 msgstr "关闭这个空格分隔的列表中的群聊 JID 标签/窗口前总是询问。"
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:188
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 msgstr "关闭这个空格分隔的列表中的群聊 JID 标签/窗口前不再询问。"
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:189
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:192
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 msgstr "为防止地址翻译转发，忽略用以发起文件传输的主机"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 KiB = 1024 字节，KB = 1000 字节。"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:196
 msgid "Notify of events in the system trayicon."
 msgstr "在系统托盘图标通知事件。"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:202
 msgid "Show tab when only one conversation?"
 msgstr "只有一个会话时显示标签？"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:203
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天窗口中显示标签？"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:204
 msgid "Show close button in tab?"
 msgstr "在标签上显示关闭键？"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:205
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3782,17 +3770,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:214
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "聊天状态指示(_F)："
 
-#: ../src/common/config.py:210
+#: ../src/common/config.py:219
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "用分号隔开的群聊中将高亮显示的单词列表。"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:220
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3800,13 +3788,13 @@ msgstr ""
 "如选是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标"
 "时才会生效。"
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "如选是， Gajim 会在每次启动时为 xmpp:// 注册。"
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:222
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3814,7 +3802,7 @@ msgstr ""
 "如选是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能"
 "是动态的。"
 
-#: ../src/common/config.py:214
+#: ../src/common/config.py:223
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3822,23 +3810,23 @@ msgstr ""
 "如选是， Gajim 将显示状态消息，如果不为空，将在名单窗口中每一个联系人名字的下"
 "方显示状态信息。"
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 msgstr "如选是， Gajim 会为每一个缓存过久或上次未获得明细的联系人请求明细"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:230
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr "如选否，您将不再打印聊天中的联系人变更其状态和状态消息的状态行。"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:231
 #, fuzzy
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
@@ -3851,28 +3839,28 @@ msgstr ""
 "状态或他/她的状态消息时 Gajim 将不再打印状态行。如果是 \"全部\" Gajim 将打印"
 "所有的状态消息。如果是 \"登入与登出\"， Gajim 将只打印群聊中登入与登出消息。"
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:233
 msgid "Background color of contacts when they just signed in."
 msgstr "当联系人登入时的背景色。"
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed out."
 msgstr "当联系人登出时的背景色。"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:236
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "如果为真，还原消息将用较小的字体。"
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:237
 msgid "Don't show avatar for the transport itself."
 msgstr "不显示代理本身的明细。"
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:238
 msgid "Don't show roster in the system taskbar."
 msgstr "不在系统任务栏显示名单。"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:239
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3881,7 +3869,7 @@ msgstr ""
 "如选是并且 GTK+ 和 PyGTK 版本高于2.8，当有未决事件时窗口将会闪动(大部分窗口管"
 "理器的默认响应)"
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:241
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3891,7 +3879,7 @@ msgstr ""
 "止在群聊中发送 SHA 信息。"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:235
+#: ../src/common/config.py:244
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3910,65 +3898,79 @@ msgstr ""
 "'每种类型' - 每种类型的消息 (例如, 单独聊天 及 群聊) 都发送到一个单独的窗口。"
 "注意，改变该选项后必须重启 Gajim 使设置生效。"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:245
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "如选否，您将不会在窗口中看到明细。"
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:246
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "如选是，按 Escape 键关闭标签/窗口。"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "在群聊窗口中隐藏按钮。"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:248
 msgid "Hides the banner in a group chat window"
 msgstr "在群聊窗口中隐藏标语"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:249
 msgid "Hides the banner in two persons chat window"
 msgstr "在双人聊天窗口中隐藏标语"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:250
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "在群聊窗口中隐藏房主列表。"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:251
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 msgstr "在聊天中，只在当前一条消息不是同一人发出的的时候在一行前显示昵称。"
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:252
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "当合并连续昵称时缩进。"
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "发送消息并关闭窗口"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:254
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "将会在群聊中使用彩色昵称的颜色列表。"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:255
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "当没有新消息时按 Ctrl-Tab 转到下一个撰写标签。"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:256
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr "是否显示确认元联系人创建对话框？空字符串意味着从不显示对话框。"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:257
+#, fuzzy
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr "是否显示确认元联系人创建对话框？空字符串意味着从不显示对话框。"
+
+#: ../src/common/config.py:258
+#, fuzzy
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr "是否显示确认元联系人创建对话框？空字符串意味着从不显示对话框。"
+
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -3978,148 +3980,169 @@ msgstr ""
 "如果为真，您将可以在修改账户窗口中为您的账户可以设置一个否定优先级。注意！当"
 "您使用否定优先级登入时您将从服务器收不到任何消息。"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:260
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:263
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:264
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:266
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:267
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:268
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:270
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:271
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:272
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
 "accoutn is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
 #: ../src/common/config.py:273
+msgid "If True, completion in groupchats will be like a shell auto-completion"
+msgstr ""
+
+#: ../src/common/config.py:274
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+
+#: ../src/common/config.py:286
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:294
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:295
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:297
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+
+#: ../src/common/config.py:298
+#, fuzzy
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr "如选否，您将不会在窗口中看到明细。"
+
+#: ../src/common/config.py:301
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:303
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:304
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:305
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:306
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:307
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:309
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:318
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:319
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:323
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:313
+#: ../src/common/config.py:327
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 工作区"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:331
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4127,302 +4150,309 @@ msgstr ""
 "如果选定， Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设"
 "置(_P)"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:345
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:346
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:354
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:417
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否为此联系人使用 OpenPGP?"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:418
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:405 ../src/common/config.py:408
+#: ../src/common/config.py:419 ../src/common/config.py:422
 msgid "Language for which we want to check misspelled words"
 msgstr "想要检查拼写的语言"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:428
 msgid "all or space separated status"
 msgstr "全部或空格分隔的状态"
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:429
 msgid "'yes', 'no', or 'both'"
 msgstr "'是'，'否'或'两者'"
 
-#: ../src/common/config.py:416 ../src/common/config.py:418
-#: ../src/common/config.py:419 ../src/common/config.py:422
-#: ../src/common/config.py:423
+#: ../src/common/config.py:430 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "'yes', 'no' or ''"
 msgstr "'是'，'否'或''"
 
-#: ../src/common/config.py:429 ../src/common/pep.py:160
+#: ../src/common/config.py:443 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back soon"
 msgstr "马上回来"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:444
 msgid "Back in some minutes."
 msgstr "很快回来"
 
-#: ../src/common/config.py:431 ../src/common/pep.py:130
+#: ../src/common/config.py:445 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "吃饭"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:445
 msgid "I'm eating, so leave me a message."
 msgstr "正在吃饭，请留言"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "Movie"
 msgstr "电影"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:446
 msgid "I'm watching a movie."
 msgstr "正在看电影"
 
-#: ../src/common/config.py:433 ../src/common/pep.py:189
+#: ../src/common/config.py:447 ../src/common/pep.py:189
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:447
 msgid "I'm working."
 msgstr "工作中"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "Phone"
 msgstr "电话"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:448
 msgid "I'm on the phone."
 msgstr "我在打电话"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:449
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活。"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:460
 msgid "I'm available."
 msgstr "我现在在线。"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:461
 msgid "I'm free for chat."
 msgstr "自由聊天。"
 
-#: ../src/common/config.py:448 ../src/config.py:1384
+#: ../src/common/config.py:462 ../src/config.py:1419
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:463
 msgid "I'm not available."
 msgstr "我现在不可用。"
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:464
 msgid "Do not disturb."
 msgstr "不分发。"
 
-#: ../src/common/config.py:451 ../src/common/config.py:452
+#: ../src/common/config.py:465 ../src/common/config.py:466
 msgid "Bye!"
 msgstr "再见！"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:476
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr "当收到的群聊消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:477
 msgid "Sound to play when any MUC message arrives."
 msgstr "当 MUC 信息到达时的声音"
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:244
+#: ../src/common/config.py:486 ../src/common/optparser.py:259
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:230
+#: ../src/common/config.py:490 ../src/common/optparser.py:245
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:480
+#: ../src/common/config.py:494
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:498
 msgid "marine"
 msgstr "海洋"
 
-#: ../src/common/connection_handlers.py:75
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
+#: ../src/common/connection_handlers.py:76
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
 msgid "Unable to load idle module"
 msgstr "无法加载发呆模块"
 
-#: ../src/common/connection_handlers.py:243
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/connection_handlers.py:244
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 msgid "Wrong host"
 msgstr "错误主机"
 
-#: ../src/common/connection_handlers.py:244
+#: ../src/common/connection_handlers.py:245
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 所需的注册信息未按时抵达"
 
-#: ../src/common/connection_handlers.py:684
+#: ../src/common/connection_handlers.py:685
 #, fuzzy
 msgid "Registration succeeded"
 msgstr " vCard 发布成功"
 
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:686
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, fuzzy
 msgid "Registration failed"
 msgstr "vCard 发布失败"
 
-#: ../src/common/connection_handlers.py:687
+#: ../src/common/connection_handlers.py:688
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:987
-#: ../src/common/connection_handlers.py:2070
-#: ../src/common/connection_handlers.py:2116
-#: ../src/common/connection_handlers.py:2311
-#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
-#: ../src/gajim.py:368
+#: ../src/common/connection_handlers.py:990
+#: ../src/common/connection_handlers.py:2071
+#: ../src/common/connection_handlers.py:2117
+#: ../src/common/connection_handlers.py:2345
+#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
+#: ../src/gajim.py:380
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
+#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "不支持扩展"
 
-#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
-#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
-#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
+#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
+#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
+#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:1893
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2314
-#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
-#: ../src/gajim.py:155 ../src/session.py:126
+#: ../src/common/connection_handlers.py:2074
+#: ../src/common/connection_handlers.py:2120
+#: ../src/common/connection_handlers.py:2348
+#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
+#: ../src/gajim.py:155 ../src/session.py:131
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2200
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "昵称不允许： %s "
 
+#. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2273
-#: ../src/common/connection_handlers.py:2276
-#: ../src/common/connection_handlers.py:2279
-#: ../src/common/connection_handlers.py:2282
-#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
+#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2303
+#: ../src/common/connection_handlers.py:2309
+#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2315
+#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
 msgid "Unable to join group chat"
 msgstr "无法加入群聊"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2296
+#, python-format
+msgid "Maximum number of users for %s has been reached"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:2304
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "您被该群聊封禁。"
 
-#: ../src/common/connection_handlers.py:2277
+#: ../src/common/connection_handlers.py:2310
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "不存在这样的群聊"
 
-#: ../src/common/connection_handlers.py:2280
+#: ../src/common/connection_handlers.py:2313
 msgid "Group chat creation is restricted."
 msgstr "群聊创建受限。"
 
-#: ../src/common/connection_handlers.py:2283
+#: ../src/common/connection_handlers.py:2316
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "您注册的昵称已被使用"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:2320
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "您不在成员名单中。"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2329
+#: ../src/common/connection_handlers.py:2363
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "授权被移除"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../src/common/connection_handlers.py:2371
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:2402
 msgid "I would like to add you to my roster."
 msgstr "我申请添加您到联系人名单"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2388
+#: ../src/common/connection_handlers.py:2423
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr " %s 请求认证"
 
-#: ../src/common/connection_handlers.py:2390
+#: ../src/common/connection_handlers.py:2425
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr " %s 请求解除认证"
 
-#: ../src/common/connection_handlers.py:2392
+#: ../src/common/connection_handlers.py:2427
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s 解除了认证"
 
-#: ../src/common/connection_handlers.py:2580
+#: ../src/common/connection_handlers.py:2619
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4431,285 +4461,271 @@ msgstr ""
 "JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ 的名"
 "单管理工具移除。"
 
-#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2614
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-msgid "OpenPGP passphrase was not given"
-msgstr "未获得 OpenPGP 密文"
-
-#. %s is the account name here
-#: ../src/common/connection_handlers.py:2616
-#: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1962
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "您将在无 OpenPGP 情况下连接到 %s。"
-
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "无法加载发呆模块"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "无效用户名"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:281
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:278
+#: ../src/common/zeroconf/connection_zeroconf.py:215
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:279
 msgid "Reconnect manually."
 msgstr "手动重连。"
 
-#: ../src/common/connection.py:293
+#: ../src/common/connection.py:290
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:324
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:337
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知的 D-Bus 版本： %s"
 
 #. wrong answer
-#: ../src/common/connection.py:355
+#: ../src/common/connection.py:352
 msgid "Invalid answer"
 msgstr "无效答案"
 
-#: ../src/common/connection.py:356
+#: ../src/common/connection.py:353
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
 
-#: ../src/common/connection.py:639 ../src/common/connection.py:768
-#: ../src/common/connection.py:1524
-#: ../src/common/zeroconf/connection_zeroconf.py:251
+#: ../src/common/connection.py:636 ../src/common/connection.py:765
+#: ../src/common/connection.py:1526
+#: ../src/common/zeroconf/connection_zeroconf.py:249
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:640 ../src/gajim.py:1076
+#: ../src/common/connection.py:637 ../src/gajim.py:1094
 msgid "Check your connection or try again later."
 msgstr "检查连接并稍后重试。"
 
-#: ../src/common/connection.py:645
+#: ../src/common/connection.py:642
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "保存在： %s"
 
-#: ../src/common/connection.py:658
+#: ../src/common/connection.py:655
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "连接失败"
 
-#: ../src/common/connection.py:689 ../src/common/connection.py:748
+#: ../src/common/connection.py:686 ../src/common/connection.py:745
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:690 ../src/common/connection.py:749
+#: ../src/common/connection.py:687 ../src/common/connection.py:746
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:712
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:718
+#: ../src/common/connection.py:715
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:717
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "未知的 D-Bus 版本： %s"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:766
 msgid "Check your connection or try again later"
 msgstr "检查连接并稍后重试"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:794
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "“%s”登录验证失败"
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:796
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:862
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "添加服务错误。 %s"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:863
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
+#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "无法发送空文件"
 
-#: ../src/common/connection.py:1207
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1204
+#: ../src/common/zeroconf/connection_zeroconf.py:389
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1209
-#: ../src/common/zeroconf/connection_zeroconf.py:393
+#: ../src/common/connection.py:1206
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1254
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
 
-#: ../src/common/connection.py:1359
-#: ../src/common/zeroconf/connection_zeroconf.py:470
+#: ../src/common/connection.py:1356
+#: ../src/common/zeroconf/connection_zeroconf.py:468
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4718,30 +4734,40 @@ msgstr ""
 "主题：%s\n"
 "%s"
 
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1383
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1389
+#: ../src/common/connection.py:1386
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "联系人"
 
-#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
+#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
 msgid "Not fetched because of invisible status"
 msgstr "由于隐身状态不获取"
 
+#: ../src/common/connection.py:1982
+#, fuzzy
+msgid "Unregister failed"
+msgstr "vCard 发布失败"
+
+#: ../src/common/connection.py:1983
+#, python-format
+msgid "Unregistration with server %(server)s failed: %(error)s"
+msgstr ""
+
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:981
+#: ../src/gajim.py:999
 msgid "Observers"
 msgstr "旁观者"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
-#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
-#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
+#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
+#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
+#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
 msgid "Transports"
 msgstr "代理"
 
@@ -4751,14 +4777,19 @@ msgid "Not in roster"
 msgstr "不在名单中"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:43
+#: ../src/common/dbus_support.py:40
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "本机缺少 D-Bus python 绑定"
 
-#: ../src/common/dbus_support.py:44
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim 的 D-Bus 兼容性无法使用"
 
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:50
+msgid "D-Bus does not run correctly on this machine"
+msgstr ""
+
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "pysqlite2 (aka python-pysqlite2) 匹配缺失。正在退出..."
@@ -4833,56 +4864,69 @@ msgid "eleven"
 msgstr "十一"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
-#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
+#. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s 点钟"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "five past %(0)s"
 msgstr "五过 %(0)s"
 
 #: ../src/common/fuzzyclock.py:44
+#, python-format
 msgid "ten past %(0)s"
 msgstr "十过 %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "quarter past %(0)s"
 msgstr "四分之一过 %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty past %(0)s"
 msgstr "二十过 %(0)s"
 
 #: ../src/common/fuzzyclock.py:45
+#, python-format
 msgid "twenty five past %(0)s"
 msgstr "二十五过 %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "half past %(0)s"
 msgstr "半过 %(0)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty five to %(1)s"
 msgstr "二十五到 %(1)s"
 
 #: ../src/common/fuzzyclock.py:46
+#, python-format
 msgid "twenty to %(1)s"
 msgstr "二十到 %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "quarter to %(1)s"
 msgstr "四分之一到 %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "ten to %(1)s"
 msgstr "十到 %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "five to %(1)s"
 msgstr "五到 %(1)s"
 
 #: ../src/common/fuzzyclock.py:47
+#, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s 点"
 
@@ -4950,222 +4994,222 @@ msgstr "无效的主机名特征。"
 msgid "Invalid character in resource."
 msgstr "无效的资源特征。"
 
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:195
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:197
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:200
 msgid "_Not Available"
 msgstr "不可用(_N)"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:205
 msgid "_Free for Chat"
 msgstr "自由聊天(_F)"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:207
 msgid "Free for Chat"
 msgstr "自由聊天"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:210
 msgid "_Available"
 msgstr "在线(_A)"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:116
 msgid "Available"
 msgstr "在线"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:214
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:217
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:222
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:224
 msgid "Offline"
 msgstr "离线"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:227
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:233
 msgid "?contact has status:Unknown"
 msgstr "?contact has status: 未知"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:235
 msgid "?contact has status:Has errors"
 msgstr "?contact has status: 有错误"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:240
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have: 无"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:242
 msgid "To"
 msgstr "到"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:246
 msgid "Both"
 msgstr "双方"
 
-#: ../src/common/helpers.py:249
+#: ../src/common/helpers.py:254
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription): 无"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:256
 msgid "Subscribe"
 msgstr "认证"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:265
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role: 无"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:268
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:270
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:273
 msgid "Participants"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:275
 msgid "Participant"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:278
 msgid "Visitors"
 msgstr "访客"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:280
 msgid "Visitor"
 msgstr "访客"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:286
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation: 无"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:288
 msgid "Owner"
 msgstr "所有者"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:290
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:292
 msgid "Member"
 msgstr "成员"
 
-#: ../src/common/helpers.py:324
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr "正在专注于聊天"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr "在做其他事"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr "正在输入消息..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr "中断输入消息"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:653
+#: ../src/common/helpers.py:658
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:656
+#: ../src/common/helpers.py:661
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:660
+#: ../src/common/helpers.py:665
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:668
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:667
+#: ../src/common/helpers.py:672
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:675
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:678
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "发送消息"
 
-#: ../src/common/helpers.py:1174
+#: ../src/common/helpers.py:1179
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
+#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1184
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
+#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 
-#: ../src/common/helpers.py:1226
+#: ../src/common/helpers.py:1231
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#: ../src/common/latex.py:108
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5181,11 +5225,11 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
+#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:356
+#: ../src/common/optparser.py:371
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "合并日志数据库"
@@ -5904,28 +5948,40 @@ msgid ""
 msgstr "或许您正在运行另一个 Gajim 实例。文件传输将被取消。"
 
 #. we're not english
-#: ../src/common/stanza_session.py:281
+#: ../src/common/stanza_session.py:301
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr "您配置主机为 ft_override_host_to_send 高级选项无效，忽略。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#. We didn't set a passphrase
+#: ../src/common/zeroconf/connection_zeroconf.py:173
+msgid "OpenPGP passphrase was not given"
+msgstr "未获得 OpenPGP 密文"
+
+#. %s is the account name here
+#: ../src/common/zeroconf/connection_zeroconf.py:175
+#: ../src/roster_window.py:1970
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "您将在无 OpenPGP 情况下连接到 %s。"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "您需要重新连接才能继续收发消息。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 msgid "Avahi error"
 msgstr "Avahi 错误"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:239
 #, python-format
 msgid ""
 "%s\n"
@@ -5934,53 +5990,53 @@ msgstr ""
 "%s\n"
 "本地消息将无法正常工作。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:250
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "请检查 Avahi 是否已经安装。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:261
-#: ../src/common/zeroconf/connection_zeroconf.py:265
+#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:263
 msgid "Could not start local service"
 msgstr "无法启动本地服务"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:260
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "无法绑定端口 %d。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:264
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid "Please check if avahi-daemon is running."
 msgstr "请检查 avahi-daemon 是否运行。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:360
+#: ../src/common/zeroconf/connection_zeroconf.py:358
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "无法改变账户“%s”的状态"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr "没有连接或隐身。您的消息将不会被发送。"
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:401
+#: ../src/common/zeroconf/connection_zeroconf.py:399
 msgid "[This message is encrypted]"
 msgstr "[本条消息已加密]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:485
+#: ../src/common/zeroconf/connection_zeroconf.py:483
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "联系人离线。您的消息将不被发送。"
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:491
+#: ../src/common/zeroconf/connection_zeroconf.py:489
 msgid "Contact is offline. Your message could not be sent."
 msgstr "联系人离线。您的消息将不被发送。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:590
+#: ../src/common/zeroconf/connection_zeroconf.py:593
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "到主机的连接无法建立：发送数据超时。"
@@ -5991,26 +6047,26 @@ msgstr "到主机的连接无法建立：发送数据超时。"
 msgid "Error while adding service. %s"
 msgstr "添加服务错误。 %s"
 
-#: ../src/config.py:151 ../src/config.py:595
+#: ../src/config.py:151 ../src/config.py:597
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../src/config.py:394
+#: ../src/config.py:396
 #, fuzzy
 msgid "Default Message"
 msgstr "默认状态消息"
 
-#: ../src/config.py:403
+#: ../src/config.py:405
 #, fuzzy
 msgid "Enabled"
 msgstr "启用"
 
-#: ../src/config.py:661 ../src/dialogs.py:1305
+#: ../src/config.py:663 ../src/dialogs.py:1327
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "语言 %s 的字典不可用"
 
-#: ../src/config.py:662
+#: ../src/config.py:664
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6018,207 +6074,213 @@ msgid ""
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message title"
 msgstr "状态消息标题"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1040
 msgid "status message text"
 msgstr "状态消息文本"
 
 #. Name column
-#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
-#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
+#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
 #: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config.py:1392
+#: ../src/config.py:1428
 msgid "Relogin now?"
 msgstr "现在重新登录？"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1429
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有调整立即生效，您必须重新登录。"
 
-#: ../src/config.py:1521 ../src/config.py:1643
+#: ../src/config.py:1559 ../src/config.py:1684
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/config.py:1679 ../src/config.py:1724
+#: ../src/config.py:1720 ../src/config.py:1764
 msgid "Unread events"
 msgstr "未读取的事件"
 
-#: ../src/config.py:1680
+#: ../src/config.py:1721
 msgid "Read all pending events before removing this account."
 msgstr "移除帐号前请阅读所有未决事件。"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1747
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在账户 %s 打开聊天"
 
-#: ../src/config.py:1707
+#: ../src/config.py:1748
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和群聊窗口将会关闭。您想继续吗？"
 
-#: ../src/config.py:1720
+#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1761
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:1725
+#: ../src/config.py:1765
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称，需先处理所有未决事件"
 
-#: ../src/config.py:1731
+#: ../src/config.py:1771
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1772
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/config.py:1736 ../src/config.py:1740
+#: ../src/config.py:1776 ../src/config.py:1780
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1777
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1741
+#: ../src/config.py:1781
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:1816
+#: ../src/config.py:1856
 #, fuzzy
 msgid "Rename Account"
 msgstr "帐户管理"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1857
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/config.py:1845
+#: ../src/config.py:1885
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:2053 ../src/config.py:3237
+#: ../src/config.py:2093 ../src/config.py:3327
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:2054 ../src/config.py:3238
+#: ../src/config.py:2094 ../src/config.py:3328
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2115
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:2076
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#: ../src/config.py:2116
+#, fuzzy
+msgid "There is no OpenPGP secret key available."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:2111
+#: ../src/config.py:2150
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:2112
+#: ../src/config.py:2151
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
 
-#: ../src/config.py:2119
+#: ../src/config.py:2158
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:2120
+#: ../src/config.py:2159
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
-#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
+#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:2128
+#: ../src/config.py:2167
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:2132
+#: ../src/config.py:2171
 msgid "Your server doesn't support Vcard"
 msgstr "您的服务器不支持 Vcard"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2172
 msgid "Your server can't save your personal information."
 msgstr "您的服务器无法保存您的个人信息。"
 
-#: ../src/config.py:2164
+#: ../src/config.py:2284 ../src/config.py:2318
+#, fuzzy
+msgid "To disable the account, you must be disconnected."
+msgstr "如要改变账户名称，需断开连接。"
+
+#: ../src/config.py:2289
 msgid "Account Local already exists."
 msgstr "帐户本地已存在。"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2290
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "请在使用本地消息前重命名或移除它。"
 
-#: ../src/config.py:2348
+#: ../src/config.py:2438
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2440
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
 #. list at the beginning
-#: ../src/config.py:2386
+#: ../src/config.py:2476
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2477
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2478
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2479
 msgid "Administrator List"
 msgstr "管理员列表"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2448
+#: ../src/config.py:2538
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2455
+#: ../src/config.py:2545
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2551
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2578
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2490
+#: ../src/config.py:2580
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6226,11 +6288,11 @@ msgstr ""
 "<b>想做封禁谁？</b>\n"
 "\n"
 
-#: ../src/config.py:2492
+#: ../src/config.py:2582
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2583
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6238,11 +6300,11 @@ msgstr ""
 "<b>想要将谁加为成员？</b>\n"
 "\n"
 
-#: ../src/config.py:2495
+#: ../src/config.py:2585
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2496
+#: ../src/config.py:2586
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6251,11 +6313,11 @@ msgstr ""
 "<b>想要将谁加为房主？</b>\n"
 "\n"
 
-#: ../src/config.py:2498
+#: ../src/config.py:2588
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2499
+#: ../src/config.py:2589
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6263,7 +6325,7 @@ msgstr ""
 "<b>想要指定谁为管理员？</b>\n"
 "\n"
 
-#: ../src/config.py:2500
+#: ../src/config.py:2590
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6280,128 +6342,126 @@ msgstr ""
 "4. domain (该域本身匹配, 例如任何 user@domain,\n"
 "domain/resource, 或者地址包含一个子域."
 
-#: ../src/config.py:2597
+#: ../src/config.py:2687
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
+#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2620 ../src/gajim.py:1537
+#: ../src/config.py:2710 ../src/gajim.py:1568
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2621 ../src/gajim.py:1557
+#: ../src/config.py:2711 ../src/gajim.py:1588
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2630
+#: ../src/config.py:2720
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2721
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "Default"
 msgstr "默认"
 
-#: ../src/config.py:2729
+#: ../src/config.py:2819
 msgid "?print_status:All"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:2730
+#: ../src/config.py:2820
 msgid "Enter and leave only"
 msgstr "只是登录和离开"
 
-#: ../src/config.py:2731
+#: ../src/config.py:2821
 #, fuzzy
 msgid "?print_status:None"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:2799
+#: ../src/config.py:2889
 msgid "New Group Chat"
 msgstr "新群聊"
 
-#: ../src/config.py:2832
+#: ../src/config.py:2922
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2923
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
 #. invalid char
-#. Invalid Nickname
-#: ../src/config.py:2951 ../src/dialogs.py:1722
-#: ../src/groupchat_control.py:1471
+#: ../src/config.py:3041 ../src/dialogs.py:1746
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "无效用户名"
 
-#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
 #, fuzzy
 msgid "Character not allowed"
 msgstr "昵称不允许： %s "
 
-#: ../src/config.py:2965 ../src/config.py:3213
+#: ../src/config.py:3055 ../src/config.py:3303
 #, fuzzy
 msgid "Invalid server"
 msgstr "无效用户名"
 
-#: ../src/config.py:2979
+#: ../src/config.py:3069
 #, fuzzy
 msgid "Invalid room"
 msgstr "无效输入"
 
-#: ../src/config.py:3130
+#: ../src/config.py:3220
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../src/config.py:3131 ../src/config.py:3137
+#: ../src/config.py:3221 ../src/config.py:3227
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
-"later by choosing the Accounts menuitem under the Edit menu from the main "
+"later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
 "项。"
 
-#: ../src/config.py:3136
+#: ../src/config.py:3226
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:3174
+#: ../src/config.py:3264
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3266
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:3214
+#: ../src/config.py:3304
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "请指定您想使用的新昵称："
 
-#: ../src/config.py:3270 ../src/gajim.py:2107
+#: ../src/config.py:3360 ../src/gajim.py:2144
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "联系人已经在名单中"
 
-#: ../src/config.py:3271 ../src/gajim.py:2108
+#: ../src/config.py:3361 ../src/gajim.py:2145
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3339
+#: ../src/config.py:3429
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6411,7 +6471,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3345 ../src/gajim.py:2132
+#: ../src/config.py:3435 ../src/gajim.py:2169
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6419,148 +6479,148 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3370 ../src/config.py:3393
+#: ../src/config.py:3460 ../src/config.py:3483
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3550
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3551
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
-#: ../src/config.py:3614
+#: ../src/config.py:3704
 msgid "Active"
 msgstr "活动"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3712
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:3657
+#: ../src/config.py:3747
 msgid "First Message Received"
 msgstr "最初收到的消息"
 
-#: ../src/config.py:3658
+#: ../src/config.py:3748
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:3660
+#: ../src/config.py:3750
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3751
 msgid "Contact Connected"
 msgstr "已连接的联系人"
 
-#: ../src/config.py:3662
+#: ../src/config.py:3752
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
 
-#: ../src/config.py:3663
+#: ../src/config.py:3753
 msgid "Message Sent"
 msgstr "消息已发送"
 
-#: ../src/config.py:3664
+#: ../src/config.py:3754
 msgid "Group Chat Message Highlight"
 msgstr "群聊消息突出显示"
 
-#: ../src/config.py:3665
+#: ../src/config.py:3755
 msgid "Group Chat Message Received"
 msgstr "收到的群聊消息"
 
-#: ../src/config.py:3666
+#: ../src/config.py:3756
 msgid "GMail Email Received"
 msgstr "收到 GMail 邮件"
 
-#: ../src/conversation_textview.py:570
+#: ../src/conversation_textview.py:592
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:589
+#: ../src/conversation_textview.py:611
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "以下文字是您上次发言至今的群聊内容"
 
-#: ../src/conversation_textview.py:702
+#: ../src/conversation_textview.py:724
 #, fuzzy
 msgid "_Quote"
 msgstr "退出(_Q)"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:731
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "“%s”的动作(_A)"
 
-#: ../src/conversation_textview.py:721
+#: ../src/conversation_textview.py:743
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:748
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:765
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "字典地址缺少 “%s” 并且它不是 WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:778
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网站搜索地址缺少 “%s”"
 
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:781
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:787
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)："
 
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:1274
 msgid "Yesterday"
 msgstr "昨天"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1278
 #, python-format
 msgid "%i days ago"
 msgstr "%i 天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题：%s\n"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:559
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber 即时消息客户端"
 
-#: ../src/dataforms_widget.py:542
+#: ../src/dataforms_widget.py:560
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:553
+#: ../src/dataforms_widget.py:571
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
+#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6596,127 +6656,127 @@ msgstr "联系人名"
 msgid "Set Mood"
 msgstr "设定 MOTD"
 
-#: ../src/dialogs.py:537
+#: ../src/dialogs.py:572
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:551
+#: ../src/dialogs.py:586
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:750
+#: ../src/dialogs.py:772
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:773
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:781
 msgid "Save as Preset Status Message"
 msgstr "<b>保存为预设状态消息</b>"
 
-#: ../src/dialogs.py:760
+#: ../src/dialogs.py:782
 msgid "Please type a name for this status message"
 msgstr "请为该状态信息键入名称："
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:807
 msgid "AIM Address:"
 msgstr "AIM 地址："
 
-#: ../src/dialogs.py:786
+#: ../src/dialogs.py:808
 msgid "GG Number:"
 msgstr "GG 号码："
 
-#: ../src/dialogs.py:787
+#: ../src/dialogs.py:809
 msgid "ICQ Number:"
 msgstr "ICQ 号码："
 
-#: ../src/dialogs.py:788
+#: ../src/dialogs.py:810
 msgid "MSN Address:"
 msgstr "MSN 地址："
 
-#: ../src/dialogs.py:789
+#: ../src/dialogs.py:811
 msgid "Yahoo! Address:"
 msgstr "Yahoo! 地址："
 
-#: ../src/dialogs.py:825
+#: ../src/dialogs.py:847
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请为账户 %s 填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:827
+#: ../src/dialogs.py:849
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
+#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
-#: ../src/dialogs.py:991
+#: ../src/dialogs.py:1013
 msgid "The user ID must not contain a resource."
 msgstr "该用户 ID 不可包含任何源"
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1018
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "我申请添加您到联系人名单"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1032
 msgid "Contact already in roster"
 msgstr "联系人已经在名单中"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1033
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已在名单中。"
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1069
 msgid "User ID:"
 msgstr "用户 ID："
 
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1127
 msgid "A GTK+ jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1128
 msgid "GTK+ Version:"
 msgstr "GTK+ 版本："
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1129
 msgid "PyGTK Version:"
 msgstr "PyGTK 版本："
 
-#: ../src/dialogs.py:1117
+#: ../src/dialogs.py:1139
 msgid "Current Developers:"
 msgstr "当前的开发者："
 
-#: ../src/dialogs.py:1119
+#: ../src/dialogs.py:1141
 msgid "Past Developers:"
 msgstr "既往开发作者："
 
-#: ../src/dialogs.py:1125
+#: ../src/dialogs.py:1147
 msgid "THANKS:"
 msgstr "感谢："
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1153
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "最后但不是最重要的，我们要特别感谢所有的软件维护人员。"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1166
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>\n"
 "jeanet <qianxiaojun604@gmail.com>"
 
-#: ../src/dialogs.py:1306
+#: ../src/dialogs.py:1328
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6726,394 +6786,404 @@ msgid ""
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
-#: ../src/groupchat_control.py:1472
+#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:1859
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "该认证要求来自帐户 %s 由 %s 发送"
 
-#: ../src/dialogs.py:1838
+#: ../src/dialogs.py:1862
 #, python-format
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:1903 ../src/gajim.py:2780
+#: ../src/dialogs.py:1928 ../src/gajim.py:2827
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已经在群聊房间 %s 。"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1934
 msgid "You can not join a group chat unless you are connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:1930
+#: ../src/dialogs.py:1970
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2050
+#, fuzzy
+msgid "Invalid Account"
+msgstr "无效的账户名称"
+
+#: ../src/dialogs.py:2051
+#, fuzzy
+msgid ""
+"You have to choose an account from which you want to join the groupchat."
+msgstr "您必须在与他人聊天前新建账户。"
+
+#: ../src/dialogs.py:2060
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "无效用户名"
 
-#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
-#: ../src/groupchat_control.py:1970
+#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
+#: ../src/groupchat_control.py:1738
 msgid "Invalid group chat Jabber ID"
 msgstr "无效的群聊 Jabber ID"
 
-#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
-#: ../src/groupchat_control.py:1971
+#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
+#: ../src/groupchat_control.py:1739
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2079
 msgid "This is not a group chat"
 msgstr "这不是一个群聊"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2080
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s 不是群聊的名称。"
 
-#: ../src/dialogs.py:2047
+#: ../src/dialogs.py:2111
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2061
+#: ../src/dialogs.py:2125
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/dialogs.py:2094
+#: ../src/dialogs.py:2158
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/dialogs.py:2095
+#: ../src/dialogs.py:2159
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:2119
+#: ../src/dialogs.py:2183
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2177
+#: ../src/dialogs.py:2241
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:2179
+#: ../src/dialogs.py:2243
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:2180
+#: ../src/dialogs.py:2244
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "填写您想发送聊天消息到的联系人 ID 或昵称："
 
 #. if offline or connecting
-#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
+#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
+#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认已连接到 “%s”。"
 
-#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
+#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
 msgid "Invalid JID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/dialogs.py:2217
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "无法解析 \"%s\"。"
 
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2290
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/dialogs.py:2245
+#: ../src/dialogs.py:2309
 msgid "You must enter a password."
 msgstr "此处必须输入密码"
 
-#: ../src/dialogs.py:2249
+#: ../src/dialogs.py:2313
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: ../src/dialogs.py:2250
+#: ../src/dialogs.py:2314
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "新消息"
 
 #. single message
-#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "新消息"
 
 #. private message
-#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "新的个人消息"
 
-#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
+#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "新的电子邮件"
 
-#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
+#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
-#: ../src/gajim.py:1823 ../src/notify.py:502
+#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
+#: ../src/gajim.py:1854 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
+#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
+#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "群聊邀请"
 
-#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "联系人状态改变"
 
-#: ../src/dialogs.py:2496
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Single Message using account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:2498
+#: ../src/dialogs.py:2572
 #, python-format
 msgid "Single Message in account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2574
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2577
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2600
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2623
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "来自 %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:2702
 #, python-format
 msgid "RE: %s"
 msgstr "回复： %s"
 
-#: ../src/dialogs.py:2629
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道：\n"
 
-#: ../src/dialogs.py:2678
+#: ../src/dialogs.py:2752
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:2680
+#: ../src/dialogs.py:2754
 msgid "XML Console"
 msgstr " XML 控制台"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:2865
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "我想添加您到我的联系人名单"
 
-#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
 msgid "Add"
 msgstr "地址"
 
-#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
 #, fuzzy
 msgid "Modify"
 msgstr "修改(_M)"
 
-#: ../src/dialogs.py:2812
+#: ../src/dialogs.py:2888
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2894
 #, fuzzy
 msgid "Groups"
 msgstr "群组"
 
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3008
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "我申请添加您到联系人名单"
 
-#: ../src/dialogs.py:3029
+#: ../src/dialogs.py:3108
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "私人列表 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3112
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:3089
+#: ../src/dialogs.py:3168
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "顺序：%s，动作：%s，类型：%s，值：%s"
 
-#: ../src/dialogs.py:3094
+#: ../src/dialogs.py:3173
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "顺序： %s，动作：%s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3215
 msgid "<b>Edit a rule</b>"
 msgstr "<b>编辑规则</b>"
 
-#: ../src/dialogs.py:3223
+#: ../src/dialogs.py:3326
 msgid "<b>Add a rule</b>"
 msgstr "<b>添加规则</b>"
 
-#: ../src/dialogs.py:3319
+#: ../src/dialogs.py:3423
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:3321
+#: ../src/dialogs.py:3425
 msgid "Privacy Lists"
 msgstr "私人列表"
 
-#: ../src/dialogs.py:3391
+#: ../src/dialogs.py:3495
 msgid "Invalid List Name"
 msgstr "无效列表名"
 
-#: ../src/dialogs.py:3392
+#: ../src/dialogs.py:3496
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个私人列表。"
 
-#: ../src/dialogs.py:3424
+#: ../src/dialogs.py:3528
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "您被该群聊封禁。"
 
-#: ../src/dialogs.py:3427
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#: ../src/dialogs.py:3429
+#: ../src/dialogs.py:3533
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#: ../src/dialogs.py:3437
+#: ../src/dialogs.py:3541
 #, python-format
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/dialogs.py:3439
+#: ../src/dialogs.py:3543
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3599
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
+#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/dialogs.py:3510
+#: ../src/dialogs.py:3614
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:3546
+#: ../src/dialogs.py:3650
 msgid "Choose Image"
 msgstr "选择形象"
 
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3668
 msgid "Images"
 msgstr "形象"
 
-#: ../src/dialogs.py:3629
+#: ../src/dialogs.py:3733
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为："
 
-#: ../src/dialogs.py:3631
+#: ../src/dialogs.py:3735
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在为 %s 添加特殊通告"
 
 #. # means number
-#: ../src/dialogs.py:3700
+#: ../src/dialogs.py:3804
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3810
 msgid "Condition"
 msgstr "条件"
 
-#: ../src/dialogs.py:3824
+#: ../src/dialogs.py:3928
 msgid "when I am "
 msgstr "当我"
 
-#: ../src/dialogs.py:4296
+#: ../src/dialogs.py:4400
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7121,38 +7191,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4404
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
+#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4314
+#: ../src/dialogs.py:4418
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4319
+#: ../src/dialogs.py:4423
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
+#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4329
+#: ../src/dialogs.py:4433
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4445
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4342
+#: ../src/dialogs.py:4446
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7162,26 +7232,26 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4447
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4375
+#: ../src/dialogs.py:4479
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4381
+#: ../src/dialogs.py:4485
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4492
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4498
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7274,20 +7344,20 @@ msgstr "描述"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3178
+#: ../src/disco.py:1659 ../src/gajim.py:3311
 msgid "Bookmark already set"
 msgstr "书签已设定"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3179
+#: ../src/disco.py:1660 ../src/gajim.py:3312
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "群聊“%s”已在您的书签中。"
 
-#: ../src/disco.py:1669 ../src/gajim.py:3192
+#: ../src/disco.py:1669 ../src/gajim.py:3325
 msgid "Bookmark has been added successfully"
 msgstr "书签添加成功"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3193
+#: ../src/disco.py:1670 ../src/gajim.py:3326
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以通过“动作”菜单管理您的名单。"
 
@@ -7300,15 +7370,15 @@ msgstr "订阅"
 msgid "Node"
 msgstr "无"
 
-#: ../src/disco.py:1928
+#: ../src/disco.py:1933
 msgid "New post"
 msgstr "新发表"
 
-#: ../src/disco.py:1934
+#: ../src/disco.py:1939
 msgid "_Subscribe"
 msgstr "认证(_S)"
 
-#: ../src/disco.py:1940
+#: ../src/disco.py:1945
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
@@ -7750,51 +7820,51 @@ msgstr "运行 Gajim 需要 X 服务器。退出..."
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:170
+#: ../src/gajim.py:180
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim 需要 PyGTK 2.6 或更高版本"
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:181
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 PyGTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:173
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim 需要 GTK 2.6 或更高版本"
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 GTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:189
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ 运行时环境缺少 libglade 支持"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:191
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:193
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "请确认您系统中 gtk+ 及 pygtk 对 libglade 的支持。"
 
-#: ../src/gajim.py:188
+#: ../src/gajim.py:198
 msgid "Gajim needs PySQLite2 to run"
 msgstr "运行 Gajim 需要 PySQLite2 "
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:206
 msgid "Gajim needs pywin32 to run"
 msgstr "运行 Gajim 需要 pywin32"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:207
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7802,11 +7872,11 @@ msgid ""
 msgstr "请确认 Pywin32 已经安装在您的系统中。您可以从 %s取得它"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:342
+#: ../src/gajim.py:354
 msgid "Gajim is already running"
 msgstr "Gajim 已经在运行"
 
-#: ../src/gajim.py:343
+#: ../src/gajim.py:355
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7814,34 +7884,34 @@ msgstr ""
 "Gajim 另一个实例似乎正在运行 \n"
 "运行？"
 
-#: ../src/gajim.py:428
+#: ../src/gajim.py:440
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/gajim.py:429
+#: ../src/gajim.py:441
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "为账户 %s 输入 GPG 密文字段"
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:455
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:456
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "您将在无 OpenPGP 情况下连接到 %s。"
 
 #. ask again
-#: ../src/gajim.py:453
+#: ../src/gajim.py:465
 msgid "Wrong Passphrase"
 msgstr "错误字段"
 
-#: ../src/gajim.py:454
+#: ../src/gajim.py:466
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点“取消”"
 
-#: ../src/gajim.py:512
+#: ../src/gajim.py:524
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7851,182 +7921,188 @@ msgstr ""
 "您申请的昵称正在使用或被其他人占有。\n"
 "从下列昵称中另外指定一个："
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:527
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:544
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:546
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gajim.py:537
+#: ../src/gajim.py:549
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) 授权给 %s (id: %s)"
 
-#: ../src/gajim.py:588 ../src/notify.py:511
+#: ../src/gajim.py:600 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: ../src/gajim.py:915 ../src/gajim.py:919
+#: ../src/gajim.py:933 ../src/gajim.py:937
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s： %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:929 ../src/gajim.py:943
+#: ../src/gajim.py:947 ../src/gajim.py:961
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "发送 %s ( %s ) 时出现错误"
 
-#: ../src/gajim.py:970 ../src/notify.py:513
+#: ../src/gajim.py:988 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "认证请求"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1013
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:1014
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人“%s”已授权您查看他/她的状态。"
 
-#: ../src/gajim.py:1008
+#: ../src/gajim.py:1026
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人“%s”移除了来自您的认证"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1027
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gajim.py:1034 ../src/notify.py:515
+#: ../src/gajim.py:1052 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "退订(_S)"
 
-#: ../src/gajim.py:1075
+#: ../src/gajim.py:1093
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与对方“ %s ”建立连接。"
 
-#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
+#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s 现在成了 %s"
 
-#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
-#: ../src/history_window.py:428 ../src/notify.py:244
+#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
+#: ../src/history_window.py:431 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
 
-#: ../src/gajim.py:1349
+#: ../src/gajim.py:1375
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
+#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1416
+#: ../src/gajim.py:1442
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1418
+#: ../src/gajim.py:1444
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1421
+#: ../src/gajim.py:1447
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1450
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1426
+#: ../src/gajim.py:1452
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1454
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1457
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1460
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1492
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "该群聊要求密码才能加入。"
 
-#: ../src/gajim.py:1500
+#: ../src/gajim.py:1526
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1528 ../src/gajim.py:1534
 msgid "You are currently connected without your OpenPGP key."
 msgstr "已建立没有 OpenPGP 密钥的连接"
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1529
 msgid "Your passphrase is incorrect"
 msgstr "您的密文不正确"
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1533
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "您的密文不正确"
+
+#: ../src/gajim.py:1559
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gajim.py:1528
+#: ../src/gajim.py:1559
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
-#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
-#: ../src/roster_window.py:3906
+#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
+#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
+#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
+#: ../src/roster_window.py:3970
 msgid "Do _not ask me again"
 msgstr "不再提问此问题(_N)"
 
-#: ../src/gajim.py:1540
+#: ../src/gajim.py:1571
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1681
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr " %(gmail_mail_address)s 上的新邮件"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1683
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "您有 %d 条新邮件会话"
 
-#: ../src/gajim.py:1665
+#: ../src/gajim.py:1696
 #, python-format
 msgid ""
 "\n"
@@ -8036,92 +8112,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1736
+#: ../src/gajim.py:1767
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#: ../src/gajim.py:1805 ../src/roster_window.py:1851
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "从名单移除联系人"
 
-#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#: ../src/gajim.py:1807 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Error opening file"
 msgstr "读文件错误："
 
-#: ../src/gajim.py:1807
+#: ../src/gajim.py:1838
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的从 %(name)s 收到文件  %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1842
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1824
+#: ../src/gajim.py:1855
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1859
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1926
+#: ../src/gajim.py:1961
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1933
+#: ../src/gajim.py:1968
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "对于每条消息(_M)"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2042
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2043
 msgid "Please type a new username for your local account"
 msgstr "<b>请在您本地账户填写新的用户名</b>"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2055
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:2033
+#: ../src/gajim.py:2068
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:2044
+#: ../src/gajim.py:2079
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2106
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gajim.py:2070
+#: ../src/gajim.py:2107
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2166
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2167
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8129,15 +8205,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2135
+#: ../src/gajim.py:2172
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2155
+#: ../src/gajim.py:2192
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2156
+#: ../src/gajim.py:2193
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8148,63 +8224,63 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2186 ../src/gajim.py:2221
+#: ../src/gajim.py:2223 ../src/gajim.py:2258
 #, fuzzy
 msgid "Insecure connection"
 msgstr "连接"
 
-#: ../src/gajim.py:2187
+#: ../src/gajim.py:2224
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/gajim.py:2189 ../src/gajim.py:2224
+#: ../src/gajim.py:2226 ../src/gajim.py:2261
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2222
+#: ../src/gajim.py:2259
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gajim.py:2242
+#: ../src/gajim.py:2279
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2243
+#: ../src/gajim.py:2280
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2737 ../src/gajim.py:2759
+#: ../src/gajim.py:2784 ../src/gajim.py:2806
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "禁用加密"
 
-#: ../src/gajim.py:2738
+#: ../src/gajim.py:2785
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2760
+#: ../src/gajim.py:2807
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2786 ../src/roster_window.py:3390
+#: ../src/gajim.py:2833 ../src/roster_window.py:3432
 msgid "You cannot join a group chat while you are invisible"
 msgstr "隐身时无法加入群聊"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3069
+#: ../src/gajim.py:3202
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
@@ -8238,12 +8314,13 @@ msgid ""
 msgstr "打印名单中所有联系人。每个联系人一行。"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
-#: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:283
 msgid "account"
 msgstr "账户"
 
@@ -8268,9 +8345,9 @@ msgstr "状态"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
 msgid "message"
 msgstr "消息"
 
@@ -8285,22 +8362,44 @@ msgid ""
 msgstr "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
 
 #: ../src/gajim-remote.py:118
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "改变一个或多个账户状态"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority"
+msgstr "优先级(_T):"
+
+#: ../src/gajim-remote.py:120
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "我想注册一个新帐户(_R)"
+
+#: ../src/gajim-remote.py:122
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
+
+#: ../src/gajim-remote.py:128
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "显示对话框用于给联系人发送消息"
 
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:130
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，将从此帐户列表下移出联系人"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:135
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:140
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8309,29 +8408,29 @@ msgstr ""
 "发送新聊天消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
 "不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:170
 msgid "message contents"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "pgp key"
 msgstr "PGP 钥匙"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，该消息将使用本公共密钥加密"
 
-#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，消息将被用此账户发送"
 
-#: ../src/gajim-remote.py:143
+#: ../src/gajim-remote.py:153
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8340,215 +8439,215 @@ msgstr ""
 "发送新单条消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
 "不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "subject"
 msgstr "主题"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:158
 msgid "message subject"
 msgstr "消息主题"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:167
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:169
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:176
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
-#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:182
 msgid "Gets detailed info on a account"
 msgstr "获得帐号的详细信息"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:184
 msgid "Name of the account"
 msgstr "帐号名称"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:188
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "file"
 msgstr "文件"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:190
 msgid "File path"
 msgstr "文件路径"
 
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:192
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，文件将被用此账户发送"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:197
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:201
 msgid "Sets value of 'key' to 'value'."
 msgstr "将“密钥”的值设为“值”"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "key=value"
 msgstr "键=值"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:203
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "“密钥”是参数名，而“值”是赋予参数的数值"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:208
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "key"
 msgstr "键"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:210
 msgid "name of the preference to be deleted"
 msgstr "需要删除的参数名"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:214
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "将当前Gajim的国家设置写入 .config 文件"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:219
 msgid "Removes contact from roster"
 msgstr "从名单移除联系人"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:228
 msgid "Adds contact to roster"
 msgstr "向名单添加联系人"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:230
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:231
 msgid "Adds new contact to this account"
 msgstr "为此账户加入新联系人"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:236
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:233
+#: ../src/gajim-remote.py:243
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "未读消息的回复总数"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:254
 msgid "Opens 'Start Chat' dialog"
 msgstr "打开 '开始聊天' 对话框"
 
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:256
 msgid "Starts chat, using this account"
 msgstr "开始聊天，使用这个账户"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:260
 msgid "Sends custom XML"
 msgstr "发送自定义 XML"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:262
 msgid "XML to send"
 msgstr "发送 XML"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:263
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr "XML 将被发送的账户；如果不指定，XML 将被发送至所有账户"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:269
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:271
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:272
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:264
+#: ../src/gajim-remote.py:274
 #, fuzzy
 msgid "Message content"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "加入新房间(_J)"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "room"
 msgstr "来自"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:280
 #, fuzzy
 msgid "Room JID"
 msgstr "房间："
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "nick"
 msgstr "昵称"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:281
 #, fuzzy
 msgid "Nickname to use"
 msgstr "昵称未找到： %s "
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "password"
 msgstr "密码："
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "密码不符"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:283
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "请检查 avahi-daemon 是否运行。"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:292
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "显示/隐藏名单窗口"
 
-#: ../src/gajim-remote.py:309
+#: ../src/gajim-remote.py:319
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的“联系人 JID”参数"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:338
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8557,31 +8656,31 @@ msgstr ""
 "\"%s\" 不在您的名单中。\n"
 "请为发送此消息指定账户。"
 
-#: ../src/gajim-remote.py:331
+#: ../src/gajim-remote.py:341
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote.py:383
+#: ../src/gajim-remote.py:393
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:416
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:420
 msgid "Arguments:"
 msgstr "参数："
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:424
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:428
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8590,7 +8689,7 @@ msgstr ""
 "用法：%s 命令 [参数] \n"
 "命令是下列之一：\n"
 
-#: ../src/gajim-remote.py:483
+#: ../src/gajim-remote.py:493
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8599,7 +8698,7 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim-remote.py:488
+#: ../src/gajim-remote.py:498
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8608,7 +8707,7 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim-remote.py:507
+#: ../src/gajim-remote.py:517
 #, fuzzy
 msgid "Wrong uri"
 msgstr "错误主机"
@@ -8639,299 +8738,174 @@ msgstr "无法删除当前主题"
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:162
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:154
+#: ../src/groupchat_control.py:164
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在群聊“%s”中或“%s”已离开。"
 
-#: ../src/groupchat_control.py:409
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
-#: ../src/groupchat_control.py:561
+#: ../src/groupchat_control.py:595
 #, fuzzy
 msgid "Conversation with "
 msgstr "对话历史"
 
-#: ../src/groupchat_control.py:563
+#: ../src/groupchat_control.py:597
 #, fuzzy
 msgid "Continued conversation"
 msgstr "连接"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1194
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1196
 #, fuzzy
 msgid "A new room has been created"
 msgstr "注册新账户成功"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1199
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1205
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1209
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1159
+#: ../src/groupchat_control.py:1219
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1223
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1298
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1290
 #, fuzzy
 msgid "affiliation changed"
 msgstr "会籍："
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1295
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1300
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1377
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1381
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1396
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1400
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1351
+#: ../src/groupchat_control.py:1429
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1434
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入群聊"
 
-#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
-#, python-format
-msgid "Nickname not found: %s"
-msgstr "昵称未找到： %s "
-
-#: ../src/groupchat_control.py:1530
-msgid "This group chat has no subject"
-msgstr "这个群聊没有主题"
-
-#: ../src/groupchat_control.py:1542
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "邀请 %(contact_jid)s 到 %(room_jid)s。"
-
-#: ../src/groupchat_control.py:1605
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface "
-msgstr ""
-
-#. We can't do the difference between nick and reason
-#. So we don't say the nick
-#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
-#, fuzzy
-msgid "Nickname not found"
-msgstr "昵称未找到： %s "
-
-#: ../src/groupchat_control.py:1645
-#, python-format
-msgid ""
-"There is an ambiguity: %d nicks match.\n"
-" Please use graphical interface"
-msgstr ""
-
-#: ../src/groupchat_control.py:1728
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
-"nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked."
-msgstr ""
-"用法：/%s <昵称|JID> [原因]，从此群聊封禁 JID。昵称可能被代替，除了包含“@”。"
-"如果 JID 在群聊里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
-
-#: ../src/groupchat_control.py:1734
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
-msgstr "用法：/%s <昵称>, 为指定房主打开一个私聊窗口"
-
-#: ../src/groupchat_control.py:1740
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
-msgstr "用法：/%s [原因]，关闭当前窗口或标签，如果指定将显示原因。"
-
-#: ../src/groupchat_control.py:1746
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
-"providing a reason."
-msgstr "用法：/%s <JID> [原因]，邀请 JID 到当前群聊，可以提供一个原因。"
-
-#: ../src/groupchat_control.py:1750
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
-msgstr "用法: /%s <房间>@<服务器>[/昵称], 申请以指定昵称加入“房间@服务器”。"
-
-#: ../src/groupchat_control.py:1754
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason."
-msgstr ""
-"用法：/%s <昵称> [原因]，通过昵称移除群聊房主，原因可选。注意：不支持含空格的"
-"昵称。"
-
-#: ../src/groupchat_control.py:1762
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message window and sends "
-"message to the occupant specified by nickname."
-msgstr ""
-"用法： /%s <昵称> [消息], 打开一个私聊窗口并且向指定昵称的联系人发送消息 "
-
-#: ../src/groupchat_control.py:1767
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "用法：/%s <昵称>，在当前群聊中改变昵称。"
-
-#: ../src/groupchat_control.py:1771
-#, python-format
-msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "用法：/%s [主题]，显示或更新群聊的拥有者。"
-
-#: ../src/groupchat_control.py:1775
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "用法：/%s [主题]，显示或更新当前群聊的主题。"
-
-#: ../src/groupchat_control.py:1778
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "用法：/%s <消息>，不使用其他命令发送消息。"
-
-#: ../src/groupchat_control.py:1781
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
-"messages."
-msgstr ""
-
-#: ../src/groupchat_control.py:1784
-#, fuzzy, python-format
-msgid ""
-"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
-"messages."
-msgstr "用法：/%s <昵称>，在当前群聊中改变昵称。"
-
-#: ../src/groupchat_control.py:1900
+#: ../src/groupchat_control.py:1668
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "确定要离开群聊“ %s ”？"
 
-#: ../src/groupchat_control.py:1902
+#: ../src/groupchat_control.py:1670
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果关闭此窗口，您将断开此群聊的连接。"
 
-#: ../src/groupchat_control.py:1939
+#: ../src/groupchat_control.py:1707
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1708
 msgid "Please specify the new subject:"
 msgstr "请指定新话题："
 
-#: ../src/groupchat_control.py:1947
+#: ../src/groupchat_control.py:1715
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1948
+#: ../src/groupchat_control.py:1716
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称："
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1977
+#: ../src/groupchat_control.py:1745
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "描述： %s"
 
-#: ../src/groupchat_control.py:1978
+#: ../src/groupchat_control.py:1746
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1980
+#: ../src/groupchat_control.py:1748
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2151
+#: ../src/groupchat_control.py:1921
 #, python-format
 msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
+#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_control.py:2456
+#: ../src/groupchat_control.py:2226
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
@@ -9002,6 +8976,15 @@ msgstr "图片不能被保存为 %(type)s 格式。保存为 %(new_filename)s？
 msgid "Save Image as..."
 msgstr "图片另存为..."
 
+#: ../src/gui_menu_builder.py:89
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "新群聊"
+
+#: ../src/gui_menu_builder.py:400
+msgid "I would like to add you to my roster"
+msgstr "我想加您为好友"
+
 #: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
@@ -9079,53 +9062,62 @@ msgstr "与 %s 的聊天历史"
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:424
+#: ../src/history_window.py:427
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:434
+#: ../src/history_window.py:438
+#, fuzzy, python-format
+msgid "Error: %s"
+msgstr "错误消息：%s"
+
+#: ../src/history_window.py:440
+msgid "Error"
+msgstr ""
+
+#: ../src/history_window.py:442
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "现在状态：%(status)s：%(status_msg)s"
 
-#: ../src/history_window.py:437
+#: ../src/history_window.py:445
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "现在状态： %(status)s "
 
-#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
+#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "无法读取图片"
 
-#: ../src/htmltextview.py:549
+#: ../src/htmltextview.py:532
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:210
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "尚未连接到服务器"
 
-#: ../src/message_window.py:211
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "您确定要删除所选定的消息？"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:481
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:483
 msgid "Group Chats"
 msgstr "群聊"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:485
 msgid "Private Chats"
 msgstr "私聊"
 
-#: ../src/message_window.py:458
+#: ../src/message_window.py:491
 msgid "Messages"
 msgstr "消息"
 
@@ -9186,12 +9178,12 @@ msgstr "九"
 msgid "Retrieving profile..."
 msgstr "取回概况..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2834
+#: ../src/profile_window.py:108 ../src/roster_window.py:2852
 #, fuzzy
 msgid "File is empty"
 msgstr "文件路径"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2837
+#: ../src/profile_window.py:111 ../src/roster_window.py:2855
 #, fuzzy
 msgid "File does not exist"
 msgstr "不存在这样的群聊"
@@ -9199,7 +9191,7 @@ msgstr "不存在这样的群聊"
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
+#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
 msgid "Could not load image"
 msgstr "无法读取图片"
 
@@ -9229,185 +9221,196 @@ msgid ""
 "later."
 msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:962
+#: ../src/roster_window.py:280 ../src/roster_window.py:1017
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:1898
+#: ../src/roster_window.py:1906
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1899
+#: ../src/roster_window.py:1907
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在“%s”将知道您的状态。"
 
-#: ../src/roster_window.py:1919
+#: ../src/roster_window.py:1927
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1920
+#: ../src/roster_window.py:1928
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1932
+#: ../src/roster_window.py:1940
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1933
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:1961
+#: ../src/roster_window.py:1969
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
+#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
 msgid "You are participating in one or more group chats"
 msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
+#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr "隐身将从所有群聊中断开。确定隐身？"
 
-#: ../src/roster_window.py:2184
+#: ../src/roster_window.py:2201
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2240
+#: ../src/roster_window.py:2257
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2241
+#: ../src/roster_window.py:2258
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "确定要离开房间“ %s ”？"
 
-#: ../src/roster_window.py:2242
+#: ../src/roster_window.py:2259
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
+#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2351
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "启用历史后才能再次重读消息"
 
-#: ../src/roster_window.py:2571
+#: ../src/roster_window.py:2588
 msgid "You must read them before removing this transport."
 msgstr "移除代理前请阅读所有未决事件。"
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2591
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:2575
+#: ../src/roster_window.py:2592
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您将无法从此代理收发消息。"
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2595
 msgid "Transports will be removed"
 msgstr "代理将被移除"
 
-#: ../src/roster_window.py:2583
+#: ../src/roster_window.py:2600
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "您将无法从这些代理的联系人收发消息：%s"
 
+#: ../src/roster_window.py:2662
+#, fuzzy
+msgid "You are about to block a contact. Are you sure you want to continue?"
+msgstr "您在创建一个元联系人。确定继续？"
+
+#: ../src/roster_window.py:2664
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+
 #. it's jid
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2748
 msgid "Rename Contact"
 msgstr "重命名联系人"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2749
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2756
 msgid "Rename Group"
 msgstr "重命名群组"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2757
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/roster_window.py:2780
+#: ../src/roster_window.py:2798
 msgid "Remove Group"
 msgstr "移除群组"
 
-#: ../src/roster_window.py:2781
+#: ../src/roster_window.py:2799
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想从名单中删除组 %s ?"
 
-#: ../src/roster_window.py:2782
+#: ../src/roster_window.py:2800
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同时从名单移除这个群组的所有联系人"
 
-#: ../src/roster_window.py:2821
+#: ../src/roster_window.py:2839
 msgid "Assign OpenPGP Key"
 msgstr "指定您的 OpenPGP 钥匙"
 
-#: ../src/roster_window.py:2822
+#: ../src/roster_window.py:2840
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3203
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:3174
+#: ../src/roster_window.py:3205
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3210
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr "移除此联系人的同时将移除认证，导致他/她将一直看到您为离线。"
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3185
+#: ../src/roster_window.py:3216
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "想做什么？"
 
-#: ../src/roster_window.py:3188
+#: ../src/roster_window.py:3219
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr "移除此联系人的同时将默认移除认证，导致他/她将一直看到您为离线。"
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3222
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3195
+#: ../src/roster_window.py:3226
 msgid "Contacts will be removed from your roster"
 msgstr "联系人将从您的名单中移除"
 
-#: ../src/roster_window.py:3200
+#: ../src/roster_window.py:3231
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9416,19 +9419,32 @@ msgstr ""
 "移除这些联系人：%s 的同时\n"
 "将移除认证导致他们将一直看到您为离线。"
 
-#: ../src/roster_window.py:3256
+#: ../src/roster_window.py:3286
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want to continue?"
+msgstr "您在创建一个元联系人。确定继续？"
+
+#: ../src/roster_window.py:3288
+#, python-format
+msgid ""
+"This contact will temporarily see you as %(status)s, but only until you "
+"change your status. Then he will see your global status."
+msgstr ""
+
+#: ../src/roster_window.py:3305
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:3257
+#: ../src/roster_window.py:3306
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:3813
+#: ../src/roster_window.py:3877
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持元联系人存储"
 
-#: ../src/roster_window.py:3815
+#: ../src/roster_window.py:3879
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9436,12 +9452,12 @@ msgid ""
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时将不被保存。"
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:3964
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:3902
+#: ../src/roster_window.py:3966
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9451,23 +9467,23 @@ msgstr ""
 "元联系人是一种分组若干联系人的方法。一般而言这用在当一个人有若干 Jabber 账户"
 "或代理账户时。"
 
-#: ../src/roster_window.py:4015
+#: ../src/roster_window.py:4081
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "无效文件"
 
-#: ../src/roster_window.py:4026
+#: ../src/roster_window.py:4092
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s 想发送给您一个文件："
 
-#: ../src/roster_window.py:4131
+#: ../src/roster_window.py:4207
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "发送 %s"
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4213
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "创建 %s 和 %s 元联系人"
@@ -9477,123 +9493,134 @@ msgstr "创建 %s 和 %s 元联系人"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
-#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
+#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
 #: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
 #. add
-#: ../src/roster_window.py:4807
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
 #. disco
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4886
 #, python-format
 msgid "using %s account"
 msgstr "使用账户 %s"
 
-#: ../src/roster_window.py:4849 ../src/systray.py:279
+#: ../src/roster_window.py:4923 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "书签管理(_M)..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4869
+#: ../src/roster_window.py:4943
 #, python-format
 msgid "of account %s"
 msgstr "帐户 %s 的"
 
-#: ../src/roster_window.py:4909
+#: ../src/roster_window.py:4983
 #, python-format
 msgid "for account %s"
 msgstr "为帐户 %s"
 
-#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
+#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:4992
+#: ../src/roster_window.py:5066
 #, fuzzy
 msgid "Publish Tune"
 msgstr "发布(_P)"
 
-#: ../src/roster_window.py:5000
+#: ../src/roster_window.py:5074
 #, fuzzy
 msgid "Configure Services..."
 msgstr "发掘服务(_D)..."
 
-#: ../src/roster_window.py:5154
+#: ../src/roster_window.py:5228
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
+#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
-#: ../src/roster_window.py:5170
+#: ../src/roster_window.py:5244
 msgid "To all users"
 msgstr "向所有的用户"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5248
 msgid "To all online users"
 msgstr "向所有在线用户"
 
-#: ../src/roster_window.py:5585
-msgid "I would like to add you to my roster"
-msgstr "我想加您为好友"
-
 #. Manage Transport submenu
-#: ../src/roster_window.py:5708
+#: ../src/roster_window.py:5424
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "重命名联系人"
 
+#. Edit Groups
+#: ../src/roster_window.py:5432
+msgid "Edit _Groups"
+msgstr "编辑群组"
+
 #. Send single message
-#: ../src/roster_window.py:5769
+#: ../src/roster_window.py:5485
 #, fuzzy
 msgid "Send Single Message"
 msgstr "发送单条消息(_S)"
 
+#. Execute Command
+#: ../src/roster_window.py:5531
+msgid "Execute Command..."
+msgstr "运行命令..."
+
 #. Manage Transport submenu
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5541
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "代理"
 
 #. Modify Transport
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5549
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "显示代理(_P)"
 
-#: ../src/roster_window.py:5907
+#. Rename
+#: ../src/roster_window.py:5558
+msgid "_Rename"
+msgstr "重命名(_R)"
+
+#: ../src/roster_window.py:5623
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5914
+#: ../src/roster_window.py:5631
 #, fuzzy
-msgid "_Disconnect"
+msgid "_Reconnect"
 msgstr "联系人已断开连接"
 
-#: ../src/roster_window.py:5994
+#: ../src/roster_window.py:5637
 #, fuzzy
-msgid "_New Group Chat"
-msgstr "新群聊"
+msgid "_Disconnect"
+msgstr "联系人已断开连接"
 
 #. History manager
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:5716
 msgid "History Manager"
 msgstr "历史管理器"
 
-#: ../src/roster_window.py:6116
+#: ../src/roster_window.py:5725
 msgid "_Join New Group Chat"
 msgstr "加入新群聊(_J)"
 
-#: ../src/roster_window.py:6273
+#: ../src/roster_window.py:5881
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
@@ -9610,20 +9637,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:123
+#: ../src/session.py:128
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:244
+#: ../src/session.py:249
 #, python-format
 msgid "Subject: %s"
 msgstr "主题：%s"
 
-#: ../src/session.py:417 ../src/session.py:452
+#: ../src/session.py:422 ../src/session.py:457
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:419
+#: ../src/session.py:424
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9633,7 +9660,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:453
+#: ../src/session.py:458
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9821,6 +9848,120 @@ msgstr ""
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
+#~ msgid "Add Special _Notification"
+#~ msgstr "添加特殊提示(_N)"
+
+#~ msgid "Assign Open_PGP Key"
+#~ msgstr "指定 Open_PGP 密钥"
+
+#~ msgid "Commands: %s"
+#~ msgstr "命令： %s "
+
+#~ msgid "Usage: /%s, clears the text window."
+#~ msgstr "用法：/%s，清除文本窗口。"
+
+#~ msgid "Usage: /%s, hide the chat buttons."
+#~ msgstr "用法：/%s，隐藏聊天按钮。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+#~ msgstr ""
+#~ "用法：/%s <动作>，发送动作到当前群聊。使用第三人称。(例如：/%s exploeds)"
+
+#, fuzzy
+#~ msgid "Usage: /%s, sends a ping to the contact"
+#~ msgstr "用法：/%s，设置群聊窗口为紧凑模式。"
+
+#, fuzzy
+#~ msgid "Usage: /%s, send the message to the contact"
+#~ msgstr "用法：/%s，隐藏聊天按钮。"
+
+#~ msgid "No help info for /%s"
+#~ msgstr "没有 /%s 的帮助信息"
+
+#~ msgid "Enable link-local/zeroconf messaging"
+#~ msgstr "允许本地连接/ ZeroConf 消息"
+
+#~ msgid "Nickname not found: %s"
+#~ msgstr "昵称未找到： %s "
+
+#~ msgid "This group chat has no subject"
+#~ msgstr "这个群聊没有主题"
+
+#~ msgid "Invited %(contact_jid)s to %(room_jid)s."
+#~ msgstr "邀请 %(contact_jid)s 到 %(room_jid)s。"
+
+#, fuzzy
+#~ msgid "Nickname not found"
+#~ msgstr "昵称未找到： %s "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+#~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
+#~ "If the JID is currently in the group chat, he/she/it will also be kicked."
+#~ msgstr ""
+#~ "用法：/%s <昵称|JID> [原因]，从此群聊封禁 JID。昵称可能被代替，除了包"
+#~ "含“@”。如果 JID 在群聊里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
+#~ "occupant."
+#~ msgstr "用法：/%s <昵称>, 为指定房主打开一个私聊窗口"
+
+#~ msgid ""
+#~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
+#~ "if specified."
+#~ msgstr "用法：/%s [原因]，关闭当前窗口或标签，如果指定将显示原因。"
+
+#~ msgid ""
+#~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
+#~ "optionally providing a reason."
+#~ msgstr "用法：/%s <JID> [原因]，邀请 JID 到当前群聊，可以提供一个原因。"
+
+#~ msgid ""
+#~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
+#~ "optionally using specified nickname."
+#~ msgstr "用法: /%s <房间>@<服务器>[/昵称], 申请以指定昵称加入“房间@服务器”。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [reason], removes the occupant specified by "
+#~ "nickname from the group chat and optionally displays a reason."
+#~ msgstr ""
+#~ "用法：/%s <昵称> [原因]，通过昵称移除群聊房主，原因可选。注意：不支持含空"
+#~ "格的昵称。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname> [message], opens a private message window and sends "
+#~ "message to the occupant specified by nickname."
+#~ msgstr ""
+#~ "用法： /%s <昵称> [消息], 打开一个私聊窗口并且向指定昵称的联系人发送消息 "
+
+#~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+#~ msgstr "用法：/%s <昵称>，在当前群聊中改变昵称。"
+
+#~ msgid "Usage: /%s , display the names of group chat occupants."
+#~ msgstr "用法：/%s [主题]，显示或更新群聊的拥有者。"
+
+#~ msgid ""
+#~ "Usage: /%s [topic], displays or updates the current group chat topic."
+#~ msgstr "用法：/%s [主题]，显示或更新当前群聊的主题。"
+
+#~ msgid ""
+#~ "Usage: /%s <message>, sends a message without looking for other commands."
+#~ msgstr "用法：/%s <消息>，不使用其他命令发送消息。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+#~ "messages."
+#~ msgstr "用法：/%s <昵称>，在当前群聊中改变昵称。"
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr "点击查看 jabber 服务器特性(如 MSN, ICQ 代理)"
 
diff --git a/scripts/dev/run-build-test.py b/scripts/dev/run-build-test.py
new file mode 100755
index 000000000..daf177e87
--- /dev/null
+++ b/scripts/dev/run-build-test.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+
+import os
+import sys
+
+if os.getcwd().endswith('dev'):
+	os.chdir('../../') # we were in scripts/dev
+
+ret = 0
+ret += os.system("make clean > " + os.devnull)
+ret += os.system("make > " + os.devnull)  
+ret += os.system("make check > " + os.devnull)
+
+if ret == 0:
+	print "Build successfull"
+	sys.exit(0)
+else:
+	print >>sys.stderr, "Build failed"
+	sys.exit(1)
+
+# vim: se ts=3:
+
diff --git a/scripts/dev/run-pychecker.py b/scripts/dev/run-pylint.py
index b4728b441..c840d8b48 100755
--- a/scripts/dev/run-pychecker.py
+++ b/scripts/dev/run-pylint.py
@@ -7,8 +7,7 @@ import sys
 if os.getcwd().endswith('dev'):
 	os.chdir('../../src/') # we were in scripts/dev
 
-os.system('pychecker --limit 10000 --no-shadowbuiltin *.py &> /tmp/pychecker-gajim.log')
-os.system('$EDITOR /tmp/pychecker-gajim.log')
+os.system("pylint --indent-string='\t' --additional-builtins='_' --disable-msg=C0111,C0103,C0111,C0112 --disable-checker=design " + "".join(sys.argv[1:]))
 
 
 # vim: se ts=3:
diff --git a/src/advanced.py b/src/advanced_configuration_window.py
index d5ed451d0..c56ee27ad 100644
--- a/src/advanced.py
+++ b/src/advanced_configuration_window.py
@@ -69,14 +69,6 @@ def tree_model_pre_order(model, treeiter):
 		for it in tree_model_pre_order(model, childiter):
 			yield it
 
-try:
-	any(()) # builtin since python 2.5
-except Exception:
-	def any(iterable):
-		for element in iterable:
-			if element:
-				return True
-		return False
 
 class AdvancedConfigurationWindow(object):
 	def __init__(self):
diff --git a/src/chat_control.py b/src/chat_control.py
index 2873066c9..286b05c00 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -33,6 +33,7 @@ import gtk
 import pango
 import gobject
 import gtkgui_helpers
+import gui_menu_builder
 import message_control
 import dialogs
 import history_window
@@ -875,7 +876,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 
 	def on_actions_button_clicked(self, widget):
 		'''popup action menu'''
-		menu = self.prepare_context_menu(True)
+		menu = self.prepare_context_menu(hide_buttonbar_items=True)
 		menu.show_all()
 		gtkgui_helpers.popup_emoticons_under_button(menu, widget,
 			self.parent_win)
@@ -2204,13 +2205,16 @@ class ChatControl(ChatControlBase):
 			label_str = '<b>' + unread + label_str + '</b>'
 		return (label_str, color)
 
-	def get_tab_image(self):
+	def get_tab_image(self, count_unread=True):
 		if self.resource:
 			jid = self.contact.get_full_jid()
 		else:
 			jid = self.contact.jid
-		num_unread = len(gajim.events.get_events(self.account, jid,
-			['printed_' + self.type_id, self.type_id]))
+		if count_unread:
+			num_unread = len(gajim.events.get_events(self.account, jid,
+				['printed_' + self.type_id, self.type_id]))
+		else:
+			num_unread = 0
 		# Set tab image (always 16x16); unread messages show the 'event' image
 		tab_img = None
 
@@ -2225,143 +2229,24 @@ class ChatControl(ChatControlBase):
 				# For transient contacts
 				contact = self.contact
 			img_16 = gajim.interface.roster.get_appropriate_state_images(
-				self.contact.jid, icon_name = contact.show)
+				self.contact.jid, icon_name=contact.show)
 			tab_img = img_16[contact.show]
 
 		return tab_img
 
-	def prepare_context_menu(self, hide_buttonbar_entries = False):
+	def prepare_context_menu(self, hide_buttonbar_items=False):
 		'''sets compact view menuitem active state
 		sets active and sensitivity state for toggle_gpg_menuitem
 		sets sensitivity for history_menuitem (False for tranasports)
 		and file_transfer_menuitem
 		and hide()/show() for add_to_roster_menuitem
 		'''
-		xml = gtkgui_helpers.get_glade('chat_control_popup_menu.glade')
-		menu = xml.get_widget('chat_control_popup_menu')
-
-		add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem')
-		history_menuitem = xml.get_widget('history_menuitem')
-		toggle_gpg_menuitem = xml.get_widget('toggle_gpg_menuitem')
-		toggle_e2e_menuitem = xml.get_widget('toggle_e2e_menuitem')
-		send_file_menuitem = xml.get_widget('send_file_menuitem')
-		information_menuitem = xml.get_widget('information_menuitem')
-		convert_to_gc_menuitem = xml.get_widget('convert_to_groupchat')
-		separatormenuitem1 = xml.get_widget('separatormenuitem1')
-		separatormenuitem2 = xml.get_widget('separatormenuitem2')
-
-		# add a special img for send file menuitem
-		path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png')
-		img = gtk.Image()
-		img.set_from_file(path_to_upload_img)
-		send_file_menuitem.set_image(img)
-
-		muc_icon = gtkgui_helpers.load_icon('muc_active')
-		if muc_icon:
-			convert_to_gc_menuitem.set_image(muc_icon)
-
-		if not hide_buttonbar_entries:
-			history_menuitem.show()
-			send_file_menuitem.show()
-			information_menuitem.show()
-			convert_to_gc_menuitem.show()
-			separatormenuitem1.show()
-			separatormenuitem2.show()
-
-		ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
-		send_file_menuitem.add_accelerator('activate', ag, gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
-			gtk.ACCEL_VISIBLE)
-		convert_to_gc_menuitem.add_accelerator('activate', ag, gtk.keysyms.g, gtk.gdk.CONTROL_MASK,
-			gtk.ACCEL_VISIBLE)
-		history_menuitem.add_accelerator('activate', ag, gtk.keysyms.h, gtk.gdk.CONTROL_MASK,
-			gtk.ACCEL_VISIBLE)
-		information_menuitem.add_accelerator('activate', ag, gtk.keysyms.i,
-			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
-
-		contact = self.parent_win.get_active_contact()
-		jid = contact.jid
-
-		e2e_is_active = self.session is not None and self.session.enable_encryption
-
-		# check if we support and use gpg
-		if not gajim.config.get_per('accounts', self.account, 'keyid') or\
-		not gajim.connections[self.account].USE_GPG or\
-		gajim.jid_is_transport(jid):
-			toggle_gpg_menuitem.set_sensitive(False)
-		else:
-			toggle_gpg_menuitem.set_sensitive(self.gpg_is_active or not e2e_is_active)
-			toggle_gpg_menuitem.set_active(self.gpg_is_active)
-
-		# disable esessions if we or the other client don't support them
-		# XXX: Once we have fallback to disco, remove notexistant check
-		if not gajim.HAVE_PYCRYPTO or \
-		not gajim.capscache.is_supported(contact, NS_ESESSION) or \
-		gajim.capscache.is_supported(contact, 'notexistant') or \
-		not gajim.config.get_per('accounts', self.account, 'enable_esessions'):
-			toggle_e2e_menuitem.set_sensitive(False)
-		else:
-			toggle_e2e_menuitem.set_active(e2e_is_active)
-			toggle_e2e_menuitem.set_sensitive(e2e_is_active or not self.gpg_is_active)
-
-		# add_to_roster_menuitem
-		if not hide_buttonbar_entries and _('Not in Roster') in contact.groups:
-			add_to_roster_menuitem.show()
-
-		# check if it's possible to send a file
-		if gajim.capscache.is_supported(contact, NS_FILE):
-			send_file_menuitem.set_sensitive(True)
-		else:
-			send_file_menuitem.set_sensitive(False)
-
-		# check if it's possible to convert to groupchat
-		if gajim.capscache.is_supported(contact, NS_MUC):
-			convert_to_gc_menuitem.set_sensitive(True)
-		else:
-			convert_to_gc_menuitem.set_sensitive(False)
-
-		# connect signals
-		id_ = history_menuitem.connect('activate',
-			self._on_history_menuitem_activate)
-		self.handlers[id_] = history_menuitem
-		id_ = send_file_menuitem.connect('activate',
-			self._on_send_file_menuitem_activate)
-		self.handlers[id_] = send_file_menuitem
-		id_ = add_to_roster_menuitem.connect('activate',
-			self._on_add_to_roster_menuitem_activate)
-		self.handlers[id_] = add_to_roster_menuitem
-		id_ = toggle_gpg_menuitem.connect('activate',
-			self._on_toggle_gpg_menuitem_activate)
-		self.handlers[id_] = toggle_gpg_menuitem
-		id_ = toggle_e2e_menuitem.connect('activate',
-			self._on_toggle_e2e_menuitem_activate)
-		self.handlers[id_] = toggle_e2e_menuitem
-		id_ = information_menuitem.connect('activate',
-			self._on_contact_information_menuitem_activate)
-		self.handlers[id_] = information_menuitem
-		id_ = convert_to_gc_menuitem.connect('activate',
-			self._on_convert_to_gc_menuitem_activate)
-		self.handlers[id_] = convert_to_gc_menuitem
-
-		menu.connect('selection-done', self.destroy_menu,
-			send_file_menuitem, convert_to_gc_menuitem,
-			information_menuitem, history_menuitem)
+		menu = gui_menu_builder.get_contact_menu(self.contact, self.account,
+			use_multiple_contacts=False, show_start_chat=False,
+			show_encryption=True, control=self,
+			show_buttonbar_items=not hide_buttonbar_items)
 		return menu
 
-	def destroy_menu(self, menu, send_file_menuitem,
-	convert_to_gc_menuitem, information_menuitem, history_menuitem):
-		# destroy accelerators
-		ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
-		send_file_menuitem.remove_accelerator(ag, gtk.keysyms.f,
-			gtk.gdk.CONTROL_MASK)
-		convert_to_gc_menuitem.remove_accelerator(ag, gtk.keysyms.g,
-			gtk.gdk.CONTROL_MASK)
-		information_menuitem.remove_accelerator(ag, gtk.keysyms.i,
-			gtk.gdk.CONTROL_MASK)
-		history_menuitem.remove_accelerator(ag, gtk.keysyms.h,
-			gtk.gdk.CONTROL_MASK)
-		# destroy menu
-		menu.destroy()
-
 	def send_chatstate(self, state, contact = None):
 		''' sends OUR chatstate as STANDLONE chat state message (eg. no body)
 		to contact only if new chatstate is different from the previous one
diff --git a/src/command_system/implementation/standard.py b/src/command_system/implementation/standard.py
index 1823caf97..d46d07a09 100644
--- a/src/command_system/implementation/standard.py
+++ b/src/command_system/implementation/standard.py
@@ -168,7 +168,7 @@ class StandardGroupchatCommands(CommandContainer):
             gajim.interface.instances[self.account]['join_gc'].window.present()
         except KeyError:
             try:
-                dialogs.JoinGroupchatWindow(account=None, room_jid=jid, nick=nick)
+                dialogs.JoinGroupchatWindow(account=self.account, room_jid=jid, nick=nick)
             except GajimGeneralException:
                 pass
 
diff --git a/src/common/config.py b/src/common/config.py
index 7e8342778..2b0262d3b 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -271,6 +271,7 @@ class Config:
 		'uri_schemes': [opt_str, 'aaa aaas acap cap cid crid data dav dict dns fax file ftp go gopher h323 http https icap im imap info ipp iris iris.beep iris.xpc iris.xpcs iris.lwz ldap mid modem msrp msrps mtqp mupdate news nfs nntp opaquelocktoken pop pres rtsp service shttp sip sips snmp soap.beep soap.beeps tag tel telnet tftp thismessage tip tv urn vemmi xmlrpc.beep xmlrpc.beeps z39.50r z39.50s about cvs daap ed2k feed fish git iax2 irc ircs ldaps magnet mms rsync ssh svn sftp smb webcal', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled separately)'), True],
 		'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!') ],
 		'shell_like_completion': [ opt_bool, False, _('If True, completion in groupchats will be like a shell auto-completion')],
+		'show_self_contact': [opt_str, 'when_other_resource', _('When is self contact row displayed. Can be "always", "when_other_resource" or "never"'), True],
 	}
 
 	__options_per_key = {
diff --git a/src/common/connection.py b/src/common/connection.py
index 39a0cc5ca..36595d8d8 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -194,14 +194,9 @@ class Connection(ConnectionHandlers):
 		self.secret_hmac = str(random.random())[2:]
 	# END __init__
 
-	def put_event(self, ev):
-		if ev[0] in gajim.handlers:
-			log.debug('Sending %s event to GUI: %s' % (ev[0], ev[1:]))
-			gajim.handlers[ev[0]](self.name, ev[1])
-
 	def dispatch(self, event, data):
 		'''always passes account name as first param'''
-		self.put_event((event, data))
+		gajim.interface.dispatch(event, self.name, data)
 
 
 	def _reconnect(self):
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index d1f0d0c17..f48a98d0a 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -905,13 +905,6 @@ class ConnectionDisco:
 					if identity['category'] == 'pubsub' and identity.get('type') == \
 					'pep':
 						self.pep_supported = True
-						if dbus_support.supported:
-							listener = MusicTrackListener.get()
-							track = listener.get_playing_track()
-							if gajim.config.get_per('accounts', self.name,
-							'publish_tune'):
-								gajim.interface.music_track_changed(listener, track,
-									self.name)
 						break
 			if features.__contains__(common.xmpp.NS_VCARD):
 				self.vcard_supported = True
@@ -2318,7 +2311,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 					# we are banned
 					self.dispatch('ERROR', (_('Unable to join group chat'),
 						_('You are banned from group chat %s.') % room_jid))
-				elif (errcode == '404') or (errcon == 'item-not-found'):
+				elif (errcode == '404') or (errcon in ('item-not-found',
+				'remote-server-not-found')):
 					if gc_control is None or gc_control.autorejoin is None:
 						# group chat does not exist
 						self.dispatch('ERROR', (_('Unable to join group chat'),
@@ -2650,7 +2644,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		gajim.logger.replace_roster(self.name, roster_version, roster)
 		if received_from_server:
 			for contact in gajim.contacts.iter_contacts(self.name):
-				if not contact.is_groupchat() and contact.jid not in roster:
+				if not contact.is_groupchat() and contact.jid not in roster and \
+				contact.jid != gajim.get_jid_from_account(self.name):
 					self.dispatch('ROSTER_INFO', (contact.jid, None, None, None,
 						()))
 			for jid in roster:
diff --git a/src/common/defs.py b/src/common/defs.py
index 92bcb527c..0f3bd1296 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
 datadir = '../'
 localedir = '../po'
 
-version = '0.12.5.6-dev'
+version = '0.12.5.7-dev'
 
 import sys, os.path
 for base in ('.', 'common'):
diff --git a/src/common/helpers.py b/src/common/helpers.py
index 2b495413d..1282e6e42 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -1191,7 +1191,7 @@ def get_notification_icon_tooltip_dict():
 					'%d event pending',
 					'%d events pending',
 					total_non_messages, total_non_messages, total_non_messages)
-				accounts[account]['event_lines'].append(text)
+				account['event_lines'].append(text)
 			else:
 				for jid in non_messages.keys():
 					text = ngettext(
@@ -1199,7 +1199,7 @@ def get_notification_icon_tooltip_dict():
 						'%d events pending',
 						non_messages[jid], non_messages[jid], non_messages[jid])
 					text += _(' from user %s') % (jid)
-					accounts[account]['event_lines'].append(text)
+					account[account]['event_lines'].append(text)
 
 	return accounts
 
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 05821a2e0..c75319775 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -201,6 +201,7 @@ class OptionsParser:
 		if old < [0, 12, 3, 1] and new >= [0, 12, 3, 1]:
 			self.update_config_to_01231()
 		if old < [0, 12, 5, 1] and new >= [0, 12, 5, 1]:
+			self.update_config_from_0125()
 			self.update_config_to_01251()
 		if old < [0, 12, 5, 2] and new >= [0, 12, 5, 2]:
 			self.update_config_to_01252()
@@ -212,6 +213,8 @@ class OptionsParser:
 			self.update_config_to_01255()
 		if old < [0, 12, 5, 6] and new >= [0, 12, 5, 6]:
 			self.update_config_to_01256()
+		if old < [0, 12, 5, 7] and new >= [0, 12, 5, 7]:
+			self.update_config_to_01257()
 
 		gajim.logger.init_vars()
 		gajim.config.set('version', new_version)
@@ -718,6 +721,14 @@ class OptionsParser:
 		con.close()
 		gajim.config.set('version', '0.12.3.1')
 
+	def update_config_from_0125(self):
+		# All those functions need to be called for 0.12.5 to 0.13 transition
+		self.update_config_to_01211()
+		self.update_config_to_01213()
+		self.update_config_to_01214()
+		self.update_config_to_01215()
+		self.update_config_to_01231()
+
 	def update_config_to_01251(self):
 		back = os.getcwd()
 		os.chdir(logger.LOG_DB_FOLDER)
@@ -793,4 +804,10 @@ class OptionsParser:
 				gajim.config.set(c, vals[c][1])
 		gajim.config.set('version', '0.12.5.6')
 
+	def update_config_to_01257(self):
+		if 'iconset' in self.old_values:
+			if self.old_values['iconset'] in ('nuvola', 'crystal', 'gossip',
+			'simplebulb', 'stellar'):
+				gajim.config.set('iconset', gajim.config.DEFAULT_ICONSET)
+		gajim.config.set('version', '0.12.5.7')
 # vim: se ts=3:
diff --git a/src/common/zeroconf/client_zeroconf.py b/src/common/zeroconf/client_zeroconf.py
index 86538c463..d9158c568 100644
--- a/src/common/zeroconf/client_zeroconf.py
+++ b/src/common/zeroconf/client_zeroconf.py
@@ -563,7 +563,7 @@ class P2PConnection(IdleObject, PlugIn):
 
 	def _on_send_failure(self):
 		log.error('Socket error while sending data')
-		self._owner.disconnected()
+		self._owner.on_disconnect()
 		self.sent_data = None
 
 class ClientZeroconf:
@@ -698,9 +698,7 @@ class ClientZeroconf:
 		# look for hashed connections
 		if to in self.recipient_to_hash:
 			conn = self.connections[self.recipient_to_hash[to]]
-			if not stanza.getID():
-				id_ = conn.Dispatcher.getAnID()
-				stanza.setID(id_)
+			id_ = stanza.getID() or ''
 			if conn.add_stanza(stanza, is_message):
 				if on_ok:
 					on_ok(id_)
@@ -710,9 +708,7 @@ class ClientZeroconf:
 			hash_ = self.ip_to_hash[item['address']]
 			if self.hash_to_port[hash_] == item['port']:
 				conn = self.connections[hash_]
-				if not stanza.getID():
-					id_ = conn.Dispatcher.getAnID()
-					stanza.setID(id_)
+				id_ = stanza.getID() or ''
 				if conn.add_stanza(stanza, is_message):
 					if on_ok:
 						on_ok(id_)
diff --git a/src/common/zeroconf/connection_zeroconf.py b/src/common/zeroconf/connection_zeroconf.py
index c23f4a125..c5a93b4b8 100644
--- a/src/common/zeroconf/connection_zeroconf.py
+++ b/src/common/zeroconf/connection_zeroconf.py
@@ -137,9 +137,7 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
 	# END __init__
 
 	def dispatch(self, event, data):
-		if event in gajim.handlers:
-			gajim.handlers[event](self.name, data)
-
+		gajim.interface.dispatch(event, self.name, data)
 
 	def _reconnect(self):
 		# Do not try to reco while we are already trying
diff --git a/src/config.py b/src/config.py
index d5be18655..3d999f689 100644
--- a/src/config.py
+++ b/src/config.py
@@ -314,6 +314,8 @@ class PreferencesWindow:
 			systray_combobox.set_active(1)
 		else:
 			systray_combobox.set_active(2)
+		if not gajim.interface.systray_capabilities:
+			systray_combobox.set_sensitive(False)
 
 		# sounds
 		if gajim.config.get('sounds_on'):
@@ -3217,14 +3219,14 @@ class AccountCreationWizardWindow:
 			finish_text = '<big><b>%s</b></big>\n\n%s' % (
 				_('Account has been added successfully'),
 				_('You can set advanced account options by pressing the '
-				'Advanced button, or later by choosing the Accounts menuitem '
+				'Advanced button, or later by choosing the Accounts menu item '
 				'under the Edit menu from the main window.'))
 		else:
 			finish_text = '<big><b>%s</b></big>\n\n%s' % (
 				_('Your new account has been created successfully'),
 				_('You can set advanced account options by pressing the Advanced '
-				'button, or later by choosing the Accounts menuitem under the Edit '
-				'menu from the main window.'))
+				'button, or later by choosing the Accounts menu item under the Edit'
+				' menu from the main window.'))
 		self.finish_label.set_markup(finish_text)
 		self.finish_button.show()
 		self.finish_button.set_property('has-default', True)
diff --git a/src/dialogs.py b/src/dialogs.py
index 3702c374b..3ec9708d6 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -53,7 +53,7 @@ except ImportError:
 # so they can do dialog.GajimThemesWindow() for example
 from filetransfers_window import FileTransfersWindow
 from gajim_themes_window import GajimThemesWindow
-from advanced import AdvancedConfigurationWindow
+from advanced_configuration_window import AdvancedConfigurationWindow
 
 from common import gajim
 from common import helpers
@@ -523,15 +523,50 @@ class ChangeMoodDialog:
 	def on_cancel_button_clicked(self, widget):
 		self.window.destroy()
 
-class ChangeStatusMessageDialog:
+class TimeoutDialog:
+	'''
+	Class designed to be derivated to create timeout'd dialogs (dialogs that
+	closes automatically after a timeout)
+	'''
+	def __init__(self, timeout, on_timeout):
+		self.countdown_left = timeout
+		self.countdown_enabled = True
+		self.title_text = ''
+		self.on_timeout = on_timeout
+
+	def run_timeout(self):
+		if self.countdown_left > 0:
+			self.countdown()
+			gobject.timeout_add_seconds(1, self.countdown)
+
+	def on_timeout():
+		'''To be implemented in derivated classes'''
+		pass
+
+	def countdown(self):
+		if self.countdown_enabled:
+			if self.countdown_left <= 0:
+				self.on_timeout()
+				return False
+			self.dialog.set_title('%s [%s]' % (self.title_text,
+				str(self.countdown_left)))
+			self.countdown_left -= 1
+			return True
+		else:
+			self.dialog.set_title(self.title_text)
+			return False
+
+class ChangeStatusMessageDialog(TimeoutDialog):
 	def __init__(self, on_response, show=None, show_pep=True):
+		countdown_time = gajim.config.get('change_status_window_timeout')
+		TimeoutDialog.__init__(self, countdown_time, self.on_timeout)
 		self.show = show
 		self.pep_dict = {}
 		self.show_pep = show_pep
 		self.on_response = on_response
 		self.xml = gtkgui_helpers.get_glade('change_status_message_dialog.glade')
-		self.window = self.xml.get_widget('change_status_message_dialog')
-		self.window.set_transient_for(gajim.interface.roster.window)
+		self.dialog = self.xml.get_widget('change_status_message_dialog')
+		self.dialog.set_transient_for(gajim.interface.roster.window)
 		msg = None
 		if show:
 			uf_show = helpers.get_uf_show(show)
@@ -550,7 +585,7 @@ class ChangeStatusMessageDialog:
 															  '_last_' + self.show, 'mood_text')
 		else:
 			self.title_text = _('Status Message')
-		self.window.set_title(self.title_text)
+		self.dialog.set_title(self.title_text)
 
 		message_textview = self.xml.get_widget('message_textview')
 		self.message_buffer = message_textview.get_buffer()
@@ -573,10 +608,6 @@ class ChangeStatusMessageDialog:
 			self.preset_messages_dict[msg_name] = opts
 		sorted_keys_list = helpers.get_sorted_keys(self.preset_messages_dict)
 
-		countdown_time = gajim.config.get('change_status_window_timeout')
-		self.countdown_left = countdown_time
-		self.countdown_enabled = True
-
 		self.message_liststore = gtk.ListStore(str) # msg_name
 		self.message_combobox = self.xml.get_widget('message_combobox')
 		self.message_combobox.set_model(self.message_liststore)
@@ -601,12 +632,10 @@ class ChangeStatusMessageDialog:
 			self.xml.get_widget('mood_button').hide()
 
 		self.xml.signal_autoconnect(self)
-		if countdown_time > 0:
-			self.countdown()
-			gobject.timeout_add(1000, self.countdown)
-		self.window.connect('response', self.on_dialog_response)
-		self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
-		self.window.show_all()
+		self.run_timeout()
+		self.dialog.connect('response', self.on_dialog_response)
+		self.dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
+		self.dialog.show_all()
 
 	def draw_activity(self):
 		'''Set activity button'''
@@ -646,26 +675,16 @@ class ChangeStatusMessageDialog:
 			img.set_from_pixbuf(None)
 			label.set_text('')
 
-	def countdown(self):
-		if self.countdown_enabled:
-			if self.countdown_left <= 0:
-				# Prevent GUI freeze when the combobox menu is opened on close
-				self.message_combobox.popdown()
-				self.window.response(gtk.RESPONSE_OK)
-				return False
-			self.window.set_title('%s [%s]' % (self.title_text,
-											   str(self.countdown_left)))
-			self.countdown_left -= 1
-			return True
-		else:
-			self.window.set_title(self.title_text)
-			return False
+	def on_timeout(self):
+		# Prevent GUI freeze when the combobox menu is opened on close
+		self.message_combobox.popdown()
+		self.dialog.response(gtk.RESPONSE_OK)
 
 	def on_dialog_response(self, dialog, response):
 		if response == gtk.RESPONSE_OK:
 			beg, end = self.message_buffer.get_bounds()
 			message = self.message_buffer.get_text(beg, end).decode('utf-8')\
-					.strip()
+				.strip()
 			message = helpers.remove_invalid_xml_chars(message)
 			msg = helpers.to_one_line(message)
 			if self.show:
@@ -684,7 +703,7 @@ class ChangeStatusMessageDialog:
 						'mood_text', self.pep_dict['mood_text'])
 		else:
 			message = None # user pressed Cancel button or X wm button
-		self.window.destroy()
+		self.dialog.destroy()
 		self.on_response(message, self.pep_dict)
 
 	def on_message_combobox_changed(self, widget):
@@ -708,7 +727,7 @@ class ChangeStatusMessageDialog:
 		if event.keyval == gtk.keysyms.Return or \
 		   event.keyval == gtk.keysyms.KP_Enter: # catch CTRL+ENTER
 			if (event.state & gtk.gdk.CONTROL_MASK):
-				self.window.response(gtk.RESPONSE_OK)
+				self.dialog.response(gtk.RESPONSE_OK)
 				# Stop the event
 				return True
 
@@ -4496,9 +4515,23 @@ class GPGInfoWindow:
 	def on_close_button_clicked(self, widget):
 		self.window.destroy()
 
+
+
+class ResourceConflictDialog(TimeoutDialog, InputDialog):
+	def __init__(self, title, text, resource, ok_handler):
+		TimeoutDialog.__init__(self, 15, self.on_timeout)
+		InputDialog.__init__(self, title, text, input_str=resource,
+			is_modal=False, ok_handler=ok_handler)
+		self.title_text = title
+		self.run_timeout()
+
+	def on_timeout(self):
+		self.on_okbutton_clicked(None)
+
+
+
 class VoIPCallReceivedDialog(object):
 	instances = {}
-
 	def __init__(self, account, contact_jid, sid, content_types):
 		self.instances[(contact_jid, sid)] = self
 		self.account = account
@@ -4596,4 +4629,5 @@ class VoIPCallReceivedDialog(object):
 
 		dialog.destroy()
 
+
 # vim: se ts=3:
diff --git a/src/gajim.py b/src/gajim.py
index 75d14c612..9f17ae7ae 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -603,10 +603,10 @@ class Interface:
 	def unblock_signed_in_notifications(self, account):
 		gajim.block_signed_in_notifications[account] = False
 
-	def handle_event_status(self, account, status): # OUR status
-		#('STATUS', account, status)
+	def handle_event_status(self, account, show): # OUR status
+		#('STATUS', account, show)
 		model = self.roster.status_combobox.get_model()
-		if status in ('offline', 'error'):
+		if show in ('offline', 'error'):
 			for name in self.instances[account]['online_dialog'].keys():
 				# .keys() is needed to not have a dictionary length changed during
 				# iteration error
@@ -618,7 +618,7 @@ class Interface:
 			# .keys() is needed because dict changes during loop
 			for account in self.pass_dialog.keys():
 				self.pass_dialog[account].window.destroy()
-		if status == 'offline':
+		if show == 'offline':
 			# sensitivity for this menuitem
 			if gajim.get_number_of_connected_accounts() == 0:
 				model[self.roster.status_message_menuitem_iter][3] = False
@@ -639,7 +639,7 @@ class Interface:
 			ctrls += self.minimized_controls[account].values()
 		for ctrl in ctrls:
 			if ctrl.account == account:
-				if status == 'offline' or (status == 'invisible' and \
+				if show == 'offline' or (show == 'invisible' and \
 				gajim.connections[account].is_zeroconf):
 					ctrl.got_disconnected()
 				else:
@@ -649,12 +649,12 @@ class Interface:
 				if ctrl.parent_win:
 					ctrl.parent_win.redraw_tab(ctrl)
 
-		self.roster.on_status_changed(account, status)
-		if account in self.show_vcard_when_connect and status not in ('offline',
+		self.roster.on_status_changed(account, show)
+		if account in self.show_vcard_when_connect and show not in ('offline',
 		'error'):
 			self.edit_own_details(account)
 		if self.remote_ctrl:
-			self.remote_ctrl.raise_signal('AccountPresence', (status, account))
+			self.remote_ctrl.raise_signal('AccountPresence', (show, account))
 
 	def edit_own_details(self, account):
 		jid = gajim.get_jid_from_account(account)
@@ -1942,6 +1942,10 @@ class Interface:
 			nick = gc_control.nick
 			password = gajim.gc_passwords.get(room_jid, '')
 			gajim.connections[account].join_gc(nick, room_jid, password)
+		# send currently played music
+		if gajim.connections[account].pep_supported and dbus_support.supported \
+		and gajim.config.get_per('accounts', account, 'publish_tune'):
+			self.enable_music_listener()
 
 	def handle_event_metacontacts(self, account, tags_list):
 		gajim.contacts.define_metacontacts(account, tags_list)
@@ -2097,9 +2101,11 @@ class Interface:
 			gajim.config.set_per('accounts', account, 'resource', new_resource)
 			self.roster.send_status(account, gajim.connections[account].old_show,
 				gajim.connections[account].status)
-		dlg = dialogs.InputDialog(_('Resource Conflict'),
-			_('You are already connected to this account with the same resource. Please type a new one'), input_str = gajim.connections[account].server_resource,
-			is_modal = False, ok_handler = on_ok)
+		proposed_resource = gajim.connections[account].server_resource
+		proposed_resource += gajim.config.get('gc_proposed_nick_char')
+		dlg = dialogs.ResourceConflictDialog(_('Resource Conflict'),
+			_('You are already connected to this account with the same resource. '
+			'Please type a new one'), resource=proposed_resource, ok_handler=on_ok)
 
 	def handle_event_jingle_incoming(self, account, data):
 		# ('JINGLE_INCOMING', account, peer jid, sid, tuple-of-contents==(type,
@@ -2459,7 +2465,17 @@ class Interface:
 			'JINGLE_DISCONNECTED': self.handle_event_jingle_disconnected,
 			'JINGLE_ERROR': self.handle_event_jingle_error,
 		}
-		gajim.handlers = self.handlers
+	
+	def dispatch(self, event, account, data):
+		'''
+		Dispatches an network event to the event handlers of this class
+		'''
+		if event not in self.handlers:
+			log.warning('Unknown event %s dispatched to GUI: %s' % (event, data))
+		else:
+			log.debug('Event %s distpached to GUI: %s' % (event, data))
+			self.handlers[event](account, data)
+		
 
 ################################################################################
 ### Methods dealing with gajim.events
@@ -2735,7 +2751,7 @@ class Interface:
 		#detects eg. *b* *bold* *bold bold* test *bold* *bold*! (*bold*)
 		#doesn't detect (it's a feature :P) * bold* *bold * * bold * test*bold*
 		formatting = r'|(?<!\w)' r'\*[^\s*]' r'([^*]*[^\s*])?' r'\*(?!\w)|'\
-			r'(?<!\w|\<)' r'/[^\s/]' r'([^/]*[^\s/])?' r'/(?!\w)|'\
+			r'(?<!\S)' r'/[^\s/]' r'([^/]*[^\s/])?' r'/(?!\S)|'\
 			r'(?<!\w)' r'_[^\s_]' r'([^_]*[^\s_])?' r'_(?!\w)'
 
 		latex = r'|\$\$[^$\\]*?([\]\[0-9A-Za-z()|+*/-]|[\\][\]\[0-9A-Za-z()|{}$])(.*?[^\\])?\$\$'
@@ -3495,12 +3511,6 @@ class Interface:
 					pass
 		gobject.timeout_add_seconds(5, remote_init)
 
-		for account in gajim.connections:
-			if gajim.config.get_per('accounts', account, 'publish_tune') and \
-			dbus_support.supported:
-				self.enable_music_listener()
-				break
-
 	def __init__(self):
 		gajim.interface = self
 		gajim.thread_interface = ThreadInterface
@@ -3704,6 +3714,8 @@ class Interface:
 			self.systray_capabilities = systray.HAS_SYSTRAY_CAPABILITIES
 			if self.systray_capabilities:
 				self.systray = systray.Systray()
+			else:
+				gajim.config.set('trayicon', 'never')
 
 		path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png')
 		pix = gtk.gdk.pixbuf_new_from_file(path_to_file)
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 4b7962135..7e9c35afa 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -535,7 +535,7 @@ class GroupchatControl(ChatControlBase):
 		label_str = unread + label_str
 		return (label_str, color)
 
-	def get_tab_image(self):
+	def get_tab_image(self, count_unread=True):
 		# Set tab image (always 16x16)
 		tab_image = None
 		if gajim.gc_connected[self.account][self.room_jid]:
@@ -1794,10 +1794,10 @@ class GroupchatControl(ChatControlBase):
 
 			# HACK: Not the best soltution.
 			if (text.startswith(self.COMMAND_PREFIX) and not
-				text.startswith(self.COMMAND_PREFIX * 2) and len(splitted_text) == 1):
+			text.startswith(self.COMMAND_PREFIX * 2) and len(splitted_text) == 1):
 				return super(GroupchatControl,
 					self).handle_message_textview_mykey_press(widget, event_keyval,
-							event_keymod)
+					event_keymod)
 
 			# nick completion
 			# check if tab is pressed with empty message
@@ -1813,8 +1813,8 @@ class GroupchatControl(ChatControlBase):
 			if gc_refer_to_nick_char and begin.endswith(gc_refer_to_nick_char):
 				with_refer_to_nick_char = True
 			if len(self.nick_hits) and self.last_key_tabs and \
-			(text[:-1].endswith(self.nick_hits[0]) or \
-			text[:-2].endswith(self.nick_hits[0])): # we should cycle
+			text[:-len(gc_refer_to_nick_char + ' ')].endswith(self.nick_hits[0]):
+				# we should cycle
 				# Previous nick in list may had a space inside, so we check text and
 				# not splitted_text and store it into 'begin' var
 				self.nick_hits.append(self.nick_hits[0])
@@ -1844,34 +1844,48 @@ class GroupchatControl(ChatControlBase):
 				else:
 					add = ' '
 				start_iter = end_iter.copy()
-				if self.last_key_tabs and with_refer_to_nick_char:
+				if self.last_key_tabs and with_refer_to_nick_char or (text and \
+				text[-1] == ' '):
 					# have to accomodate for the added space from last
 					# completion
-					start_iter.backward_chars(len(begin) + 2)
-				elif self.last_key_tabs:
+					# gc_refer_to_nick_char may be more than one char!
+					start_iter.backward_chars(len(begin) + len(add))
+				elif self.last_key_tabs and not gajim.config.get(
+				'shell_like_completion'):
 					# have to accomodate for the added space from last
 					# completion
-					start_iter.backward_chars(len(begin) + 1)
+					start_iter.backward_chars(len(begin) + \
+						len(gc_refer_to_nick_char))
 				else:
 					start_iter.backward_chars(len(begin))
 
 				message_buffer.delete(start_iter, end_iter)
-				completion = self.nick_hits[0]
 				# get a shell-like completion
 				# if there's more than one nick for this completion, complete only
-				# the part that all  these nicks have in common
+				# the part that all these nicks have in common
 				if gajim.config.get('shell_like_completion') and \
 				len(self.nick_hits) > 1:
 					end = False
-					cur = ''
-					while not end:
-						cur = self.nick_hits[0][:len(cur)+1]
+					completion = ''
+					add = "" # if nick is not complete, don't add anything
+					while not end and len(completion) < len(self.nick_hits[0]):
+						completion = self.nick_hits[0][:len(completion)+1]
 						for nick in self.nick_hits:
-							if cur.lower() not in nick.lower():
+							if completion.lower() not in nick.lower():
 								end = True
-					cur = cur[:-1]
-					completion = cur
-					add = "" # if nick is not complete, don't but any comma or so
+								completion = completion[:-1]
+								break
+					# if the current nick matches a COMPLETE existing nick,
+					# and if the user tab TWICE, complete that nick (with the "add")
+					if self.last_key_tabs:
+						for nick in self.nick_hits:
+							if nick == completion:
+							# The user seems to want this nick, so
+							# complete it as if it were the only nick
+							# available
+								add = gc_refer_to_nick_char + ' '
+				else:
+					completion = self.nick_hits[0]
 				message_buffer.insert_at_cursor(completion + add)
 				self.last_key_tabs = True
 				return True
diff --git a/src/gui_menu_builder.py b/src/gui_menu_builder.py
new file mode 100644
index 000000000..157b69718
--- /dev/null
+++ b/src/gui_menu_builder.py
@@ -0,0 +1,466 @@
+# -*- coding:utf-8 -*-
+## src/gui_menu_builder.py
+##
+## Copyright (C) 2009 Yann Leboulanger <asterix AT lagaule.org>
+##
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation; version 3 only.
+##
+## Gajim is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
+##
+
+import gtk
+import os
+import gtkgui_helpers
+import message_control
+
+from common import gajim
+from common import helpers
+from common.xmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC, NS_ESESSION
+
+def build_resources_submenu(contacts, account, action, room_jid=None,
+room_account=None, cap=None):
+	''' Build a submenu with contact's resources.
+	room_jid and room_account are for action self.on_invite_to_room '''
+	roster = gajim.interface.roster
+	sub_menu = gtk.Menu()
+
+	iconset = gajim.config.get('iconset')
+	if not iconset:
+		iconset = gajim.config.DEFAULT_ICONSET
+	path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
+	for c in contacts:
+		# icon MUST be different instance for every item
+		state_images = gtkgui_helpers.load_iconset(path)
+		item = gtk.ImageMenuItem('%s (%s)' % (c.resource, str(c.priority)))
+		icon_name = helpers.get_icon_name_to_show(c, account)
+		icon = state_images[icon_name]
+		item.set_image(icon)
+		sub_menu.append(item)
+		
+		if action == roster.on_invite_to_room:
+			item.connect('activate', action, [(c, account)], room_jid,
+				room_account, c.resource)
+		elif action == roster.on_invite_to_new_room:
+			item.connect('activate', action, [(c, account)], c.resource)
+		else: # start_chat, execute_command, send_file
+			item.connect('activate', action, c, account, c.resource)
+
+		if cap and not gajim.capscache.is_supported(c, cap):
+			item.set_sensitive(False)
+
+	return sub_menu
+
+def build_invite_submenu(invite_menuitem, list_):
+	'''list_ in a list of (contact, account)'''
+	roster = gajim.interface.roster
+	# used if we invite only one contact with several resources
+	contact_list = []
+	if len(list_) == 1:
+		contact, account = list_[0]
+		contact_list = gajim.contacts.get_contacts(account, contact.jid)
+	contacts_transport = -1
+	connected_accounts = []
+	# -1 is at start, False when not from the same, None when jabber
+	for (contact, account) in list_:
+		if not account in connected_accounts:
+			connected_accounts.append(account)
+		transport = gajim.get_transport_name_from_jid(contact.jid)
+		if contacts_transport == -1:
+			contacts_transport = transport
+		elif contacts_transport != transport:
+			contacts_transport = False
+
+	if contacts_transport == False:
+		# they are not all from the same transport
+		invite_menuitem.set_sensitive(False)
+		return
+	invite_to_submenu = gtk.Menu()
+	invite_menuitem.set_submenu(invite_to_submenu)
+	invite_to_new_room_menuitem = gtk.ImageMenuItem(_('_New Group Chat'))
+	icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU)
+	invite_to_new_room_menuitem.set_image(icon)
+	if len(contact_list) > 1: # several resources
+		invite_to_new_room_menuitem.set_submenu(build_resources_submenu(
+			contact_list, account, roster.on_invite_to_new_room, cap=NS_MUC))
+	elif len(list_) == 1 and gajim.capscache.is_supported(contact, NS_MUC):
+		invite_menuitem.set_sensitive(True)
+		# use resource if it's self contact
+		if contact.jid == gajim.get_jid_from_account(account):
+			resource = contact.resource
+		else:
+			resource = None
+		invite_to_new_room_menuitem.connect('activate',
+			roster.on_invite_to_new_room, list_, resource)
+	else:
+		invite_menuitem.set_sensitive(False)
+	# transform None in 'jabber'
+	c_t = contacts_transport or 'jabber'
+	muc_jid = {}
+	for account in connected_accounts:
+		for t in gajim.connections[account].muc_jid:
+			muc_jid[t] = gajim.connections[account].muc_jid[t]
+	if c_t not in muc_jid:
+		invite_to_new_room_menuitem.set_sensitive(False)
+	rooms = [] # a list of (room_jid, account) tuple
+	invite_to_submenu.append(invite_to_new_room_menuitem)
+	rooms = [] # a list of (room_jid, account) tuple
+	minimized_controls = []
+	for account in connected_accounts:
+		minimized_controls += gajim.interface.minimized_controls[account].values()
+	for gc_control in gajim.interface.msg_win_mgr.get_controls(
+	message_control.TYPE_GC) + minimized_controls:
+		acct = gc_control.account
+		room_jid = gc_control.room_jid
+		if room_jid in gajim.gc_connected[acct] and \
+		gajim.gc_connected[acct][room_jid] and \
+		contacts_transport == gajim.get_transport_name_from_jid(room_jid):
+			rooms.append((room_jid, acct))
+	if len(rooms):
+		item = gtk.SeparatorMenuItem() # separator
+		invite_to_submenu.append(item)
+		for (room_jid, account) in rooms:
+			menuitem = gtk.MenuItem(room_jid.split('@')[0])
+			if len(contact_list) > 1: # several resources
+				menuitem.set_submenu(build_resources_submenu(
+					contact_list, account, roster.on_invite_to_room, room_jid,
+					account))
+			else:
+				# use resource if it's self contact
+				if contact.jid == gajim.get_jid_from_account(account):
+					resource = contact.resource
+				else:
+					resource = None
+				menuitem.connect('activate', roster.on_invite_to_room, list_,
+					room_jid, account, resource)
+			invite_to_submenu.append(menuitem)
+
+def get_contact_menu(contact, account, use_multiple_contacts=True,
+show_start_chat=True, show_encryption=False, show_buttonbar_items=True,
+control=None):
+	''' Build contact popup menu for roster and chat window.
+	If control is not set, we hide invite_contacts_menuitem'''
+	if not contact:
+		return
+
+	jid = contact.jid
+	our_jid = jid == gajim.get_jid_from_account(account)
+	roster = gajim.interface.roster
+
+	xml = gtkgui_helpers.get_glade('contact_context_menu.glade')
+	contact_context_menu = xml.get_widget('contact_context_menu')
+
+	start_chat_menuitem = xml.get_widget('start_chat_menuitem')
+	execute_command_menuitem = xml.get_widget('execute_command_menuitem')
+	rename_menuitem = xml.get_widget('rename_menuitem')
+	edit_groups_menuitem = xml.get_widget('edit_groups_menuitem')
+	send_file_menuitem = xml.get_widget('send_file_menuitem')
+	assign_openpgp_key_menuitem = xml.get_widget('assign_openpgp_key_menuitem')
+	add_special_notification_menuitem = xml.get_widget(
+		'add_special_notification_menuitem')
+	information_menuitem = xml.get_widget('information_menuitem')
+	history_menuitem = xml.get_widget('history_menuitem')
+	send_custom_status_menuitem = xml.get_widget('send_custom_status_menuitem')
+	send_single_message_menuitem = xml.get_widget('send_single_message_menuitem')
+	invite_menuitem = xml.get_widget('invite_menuitem')
+	block_menuitem = xml.get_widget('block_menuitem')
+	unblock_menuitem = xml.get_widget('unblock_menuitem')
+	ignore_menuitem = xml.get_widget('ignore_menuitem')
+	unignore_menuitem = xml.get_widget('unignore_menuitem')
+	set_custom_avatar_menuitem = xml.get_widget('set_custom_avatar_menuitem')
+	# Subscription submenu
+	subscription_menuitem = xml.get_widget('subscription_menuitem')
+	send_auth_menuitem, ask_auth_menuitem, revoke_auth_menuitem = \
+		subscription_menuitem.get_submenu().get_children()
+	add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem')
+	remove_from_roster_menuitem = xml.get_widget(
+		'remove_from_roster_menuitem')
+	manage_contact_menuitem = xml.get_widget('manage_contact')
+	convert_to_gc_menuitem = xml.get_widget('convert_to_groupchat_menuitem')
+	encryption_separator = xml.get_widget('encryption_separator')
+	toggle_gpg_menuitem = xml.get_widget('toggle_gpg_menuitem')
+	toggle_e2e_menuitem = xml.get_widget('toggle_e2e_menuitem')
+	last_separator = xml.get_widget('last_separator')
+
+	items_to_hide = []
+
+	# add a special img for send file menuitem
+	path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png')
+	img = gtk.Image()
+	img.set_from_file(path_to_upload_img)
+	send_file_menuitem.set_image(img)
+
+	if not our_jid:
+		# add a special img for rename menuitem
+		path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
+			'kbd_input.png')
+		img = gtk.Image()
+		img.set_from_file(path_to_kbd_input_img)
+		rename_menuitem.set_image(img)
+
+	muc_icon = gtkgui_helpers.load_icon('muc_active')
+	if muc_icon:
+		convert_to_gc_menuitem.set_image(muc_icon)
+
+	contacts = gajim.contacts.get_contacts(account, jid)
+	if len(contacts) > 1 and use_multiple_contacts: # several resources
+		start_chat_menuitem.set_submenu(build_resources_submenu(contacts,
+			account, gajim.interface.on_open_chat_window))
+		send_file_menuitem.set_submenu(build_resources_submenu(contacts,
+			account, roster.on_send_file_menuitem_activate, cap=NS_FILE))
+		execute_command_menuitem.set_submenu(build_resources_submenu(
+			contacts, account, roster.on_execute_command, cap=NS_COMMANDS))
+	else:
+		start_chat_menuitem.connect('activate',
+			gajim.interface.on_open_chat_window, contact, account)
+		if gajim.capscache.is_supported(contact, NS_FILE):
+			send_file_menuitem.set_sensitive(True)
+			send_file_menuitem.connect('activate',
+				roster.on_send_file_menuitem_activate, contact, account)
+		else:
+			send_file_menuitem.set_sensitive(False)
+
+		if gajim.capscache.is_supported(contact, NS_COMMANDS):
+			execute_command_menuitem.set_sensitive(True)
+			execute_command_menuitem.connect('activate', roster.on_execute_command,
+				contact, account, contact.resource)
+		else:
+			execute_command_menuitem.set_sensitive(False)
+
+	rename_menuitem.connect('activate', roster.on_rename, 'contact', jid,
+		account)
+	history_menuitem.connect('activate', roster.on_history, contact, account)
+
+	if _('Not in Roster') not in contact.get_shown_groups():
+		# contact is in normal group
+		edit_groups_menuitem.connect('activate', roster.on_edit_groups, [(contact,
+			account)])
+
+		if gajim.connections[account].gpg:
+			assign_openpgp_key_menuitem.connect('activate',
+				roster.on_assign_pgp_key, contact, account)
+		else:
+			assign_openpgp_key_menuitem.set_sensitive(False)
+	else:
+		# contact is in group 'Not in Roster'
+		edit_groups_menuitem.set_sensitive(False)
+		assign_openpgp_key_menuitem.set_sensitive(False)
+
+	# Hide items when it's self contact row
+	if our_jid:
+		items_to_hide += [rename_menuitem, edit_groups_menuitem]
+
+	# Unsensitive many items when account is offline
+	if gajim.account_is_disconnected(account):
+		for widget in (start_chat_menuitem,	rename_menuitem,
+		edit_groups_menuitem, send_file_menuitem):
+			widget.set_sensitive(False)
+
+	if not show_start_chat:
+		items_to_hide.append(start_chat_menuitem)
+
+	if not show_encryption or not control:
+		items_to_hide += [encryption_separator, toggle_gpg_menuitem,
+			toggle_e2e_menuitem]
+	else:
+		e2e_is_active = control.session is not None and \
+			control.session.enable_encryption
+
+		# check if we support and use gpg
+		if not gajim.config.get_per('accounts', account, 'keyid') or \
+		not gajim.connections[account].USE_GPG or gajim.jid_is_transport(
+		contact.jid):
+			toggle_gpg_menuitem.set_sensitive(False)
+		else:
+			toggle_gpg_menuitem.set_sensitive(control.gpg_is_active or \
+				not e2e_is_active)
+			toggle_gpg_menuitem.set_active(control.gpg_is_active)
+
+		# disable esessions if we or the other client don't support them
+		# XXX: Once we have fallback to disco, remove notexistant check
+		if not gajim.HAVE_PYCRYPTO or \
+		not gajim.capscache.is_supported(contact, NS_ESESSION) or \
+		gajim.capscache.is_supported(contact, 'notexistant') or \
+		not gajim.config.get_per('accounts', account, 'enable_esessions'):
+			toggle_e2e_menuitem.set_sensitive(False)
+		else:
+			toggle_e2e_menuitem.set_active(e2e_is_active)
+			toggle_e2e_menuitem.set_sensitive(e2e_is_active or \
+				not control.gpg_is_active)
+
+	if not show_buttonbar_items:
+		items_to_hide += [history_menuitem, send_file_menuitem,
+			information_menuitem, convert_to_gc_menuitem, last_separator]
+	
+	if not control:
+		items_to_hide.append(convert_to_gc_menuitem)
+
+	for item in items_to_hide:
+		item.set_no_show_all(True)
+		item.hide()
+
+	# Zeroconf Account
+	if gajim.config.get_per('accounts', account, 'is_zeroconf'):
+		for item in (send_custom_status_menuitem, send_single_message_menuitem,
+		invite_menuitem, block_menuitem, unblock_menuitem, ignore_menuitem,
+		unignore_menuitem, set_custom_avatar_menuitem, subscription_menuitem,
+		manage_contact_menuitem):
+			item.set_no_show_all(True)
+			item.hide()
+
+		if contact.show in ('offline', 'error'):
+			information_menuitem.set_sensitive(False)
+			send_file_menuitem.set_sensitive(False)
+		else:
+			information_menuitem.connect('activate', roster.on_info_zeroconf,
+				contact, account)
+
+		contact_context_menu.connect('selection-done',
+			gtkgui_helpers.destroy_widget)
+		contact_context_menu.show_all()
+		return contact_context_menu
+
+	# normal account
+
+	# send custom status icon
+	blocked = False
+	if helpers.jid_is_blocked(account, jid):
+		blocked = True
+	else:
+		for group in contact.get_shown_groups():
+			if helpers.group_is_blocked(account, group):
+				blocked = True
+				break
+	if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
+		# Transport contact, send custom status unavailable
+		send_custom_status_menuitem.set_sensitive(False)
+	elif blocked:
+		send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon('offline'))
+		send_custom_status_menuitem.set_sensitive(False)
+	elif account in gajim.interface.status_sent_to_users and \
+	jid in gajim.interface.status_sent_to_users[account]:
+		send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon(
+			gajim.interface.status_sent_to_users[account][jid]))
+	else:
+		icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_MENU)
+		send_custom_status_menuitem.set_image(icon)
+
+	muc_icon = gtkgui_helpers.load_icon('muc_active')
+	if muc_icon:
+		invite_menuitem.set_image(muc_icon)
+
+	build_invite_submenu(invite_menuitem, [(contact, account)])
+
+	# One or several resource, we do the same for send_custom_status
+	status_menuitems = gtk.Menu()
+	send_custom_status_menuitem.set_submenu(status_menuitems)
+	iconset = gajim.config.get('iconset')
+	path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
+	for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'):
+		# icon MUST be different instance for every item
+		state_images = gtkgui_helpers.load_iconset(path)
+		status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s))
+		status_menuitem.connect('activate', roster.on_send_custom_status,
+			[(contact, account)], s)
+		icon = state_images[s]
+		status_menuitem.set_image(icon)
+		status_menuitems.append(status_menuitem)
+
+	send_single_message_menuitem.connect('activate',
+		roster.on_send_single_message_menuitem_activate, account, contact)
+
+	remove_from_roster_menuitem.connect('activate', roster.on_req_usub,
+		[(contact, account)])
+	information_menuitem.connect('activate', roster.on_info, contact, account)
+
+	if _('Not in Roster') not in contact.get_shown_groups():
+		# contact is in normal group
+		add_to_roster_menuitem.hide()
+		add_to_roster_menuitem.set_no_show_all(True)
+
+		if contact.sub in ('from', 'both'):
+			send_auth_menuitem.set_sensitive(False)
+		else:
+			send_auth_menuitem.connect('activate', roster.authorize, jid, account)
+		if contact.sub in ('to', 'both'):
+			ask_auth_menuitem.set_sensitive(False)
+			add_special_notification_menuitem.connect('activate',
+				roster.on_add_special_notification_menuitem_activate, jid)
+		else:
+			ask_auth_menuitem.connect('activate', roster.req_sub, jid,
+				_('I would like to add you to my roster'), account,
+				contact.groups, contact.name)
+		if contact.sub in ('to', 'none') or gajim.get_transport_name_from_jid(
+			jid, use_config_setting=False):
+			revoke_auth_menuitem.set_sensitive(False)
+		else:
+			revoke_auth_menuitem.connect('activate', roster.revoke_auth, jid,
+				account)
+
+	else:
+		# contact is in group 'Not in Roster'
+		add_to_roster_menuitem.set_no_show_all(False)
+		subscription_menuitem.set_sensitive(False)
+
+		add_to_roster_menuitem.connect('activate', roster.on_add_to_roster,
+			contact, account)
+
+	set_custom_avatar_menuitem.connect('activate',
+		roster.on_set_custom_avatar_activate, contact, account)
+
+	# Hide items when it's self contact row
+	if our_jid:
+		manage_contact_menuitem.set_sensitive(False)
+
+	# Unsensitive items when account is offline
+	if gajim.account_is_disconnected(account):
+		for widget in (send_single_message_menuitem, subscription_menuitem,
+		add_to_roster_menuitem, remove_from_roster_menuitem,
+		execute_command_menuitem, send_custom_status_menuitem):
+			widget.set_sensitive(False)
+
+	if gajim.connections[account] and gajim.connections[account].\
+	privacy_rules_supported:
+		if helpers.jid_is_blocked(account, jid):
+			block_menuitem.set_no_show_all(True)
+			block_menuitem.hide()
+			if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
+				unblock_menuitem.set_no_show_all(True)
+				unblock_menuitem.hide()
+				unignore_menuitem.set_no_show_all(False)
+				unignore_menuitem.connect('activate', roster.on_unblock, [(contact,
+					account)])
+			else:
+				unblock_menuitem.connect('activate', roster.on_unblock, [(contact,
+					account)])
+		else:
+			unblock_menuitem.set_no_show_all(True)
+			unblock_menuitem.hide()
+			if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
+				block_menuitem.set_no_show_all(True)
+				block_menuitem.hide()
+				ignore_menuitem.set_no_show_all(False)
+				ignore_menuitem.connect('activate', roster.on_block, [(contact,
+					account)])
+			else:
+				block_menuitem.connect('activate', roster.on_block, [(contact,
+					account)])
+	else:
+		unblock_menuitem.set_no_show_all(True)
+		block_menuitem.set_sensitive(False)
+		unblock_menuitem.hide()
+
+	contact_context_menu.connect('selection-done', gtkgui_helpers.destroy_widget)
+	contact_context_menu.show_all()
+	return contact_context_menu
+
+# vim: se ts=3:
diff --git a/src/message_control.py b/src/message_control.py
index 8792a2896..7ee724554 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -120,7 +120,7 @@ class MessageControl:
 		#return (label_str, None)
 		pass
 
-	def get_tab_image(self):
+	def get_tab_image(self, count_unread=True):
 		# Return a suitable tab image for display.
 		# None clears any current label.
 		return None
diff --git a/src/message_window.py b/src/message_window.py
index 9e4bc725c..1b4a8ea37 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -146,6 +146,7 @@ class MessageWindow(object):
 		else:
 			self.notebook.set_show_tabs(False)
 		self.notebook.set_show_border(gajim.config.get('tabs_border'))
+		self.show_icon()
 
 	def change_account_name(self, old_name, new_name):
 		if old_name in self._controls:
@@ -417,6 +418,29 @@ class MessageWindow(object):
 		'''When close button is pressed: close a tab'''
 		self.remove_tab(control, self.CLOSE_CLOSE_BUTTON)
 
+	def show_icon(self):
+		window_mode = gajim.interface.msg_win_mgr.mode
+		icon = None
+		if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_NEVER:
+			ctrl = self.get_active_control()
+			if not ctrl:
+				return
+			icon = ctrl.get_tab_image(count_unread=False)
+		elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS:
+			pass # keep default icon
+		elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
+			pass # keep default icon
+		elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERACCT:
+			pass # keep default icon
+		elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE:
+			if self.type_ == 'gc':
+				icon = gtkgui_helpers.load_icon('muc_active')
+			else:
+				# chat, pm
+				icon = gtkgui_helpers.load_icon('online')
+		if icon:
+			self.window.set_icon(icon.get_pixbuf())
+
 	def show_title(self, urgent=True, control=None):
 		'''redraw the window's title'''
 		if not control:
@@ -587,6 +611,8 @@ class MessageWindow(object):
 			else:
 				status_img.set_from_pixbuf(tab_img.get_pixbuf())
 
+		self.show_icon()
+
 	def repaint_themed_widgets(self):
 		'''Repaint controls in the window with theme color'''
 		# iterate through controls and repaint
@@ -738,6 +764,9 @@ class MessageWindow(object):
 			old_ctrl.set_control_active(False)
 
 		new_ctrl = self._widget_to_control(notebook.get_nth_page(page_num))
+		if not new_ctrl:
+			# This event is sometimes exposed without any reason. see #5366
+			return
 		new_ctrl.set_control_active(True)
 		self.show_title(control = new_ctrl)
 
diff --git a/src/roster_window.py b/src/roster_window.py
index c9201e4e7..72b6ad969 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -46,6 +46,7 @@ import vcard
 import config
 import disco
 import gtkgui_helpers
+import gui_menu_builder
 import cell_renderer_image
 import tooltips
 import message_control
@@ -64,7 +65,7 @@ from common import dbus_support
 if dbus_support.supported:
 	import dbus
 
-from common.xmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC
+from common.xmpp.protocol import NS_FILE
 from common.pep import MOODS, ACTIVITIES
 
 #(icon, name, type, jid, account, editable, second pixbuf)
@@ -676,7 +677,12 @@ class RosterWindow:
 			return
 
 		if jid == gajim.get_jid_from_account(account):
-			if contact.resource != gajim.connections[account].server_resource:
+			show_self_contact = gajim.config.get('show_self_contact')
+			if show_self_contact == 'never':
+				return
+			if (contact.resource != gajim.connections[account].server_resource and\
+			show_self_contact == 'when_other_resource') or show_self_contact == \
+			'always':
 				return self._add_self_contact(account)
 			return
 
@@ -1733,6 +1739,12 @@ class RosterWindow:
 			gajim.contacts.add_account(account)
 		if account not in gajim.groups:
 			gajim.groups[account] = {}
+		if gajim.config.get('show_self_contact') == 'always':
+			self_jid = gajim.get_jid_from_account(account)
+			if gajim.connections[account].server_resource:
+				self_jid += '/' + gajim.connections[account].server_resource
+			array[self_jid] = {'name': gajim.nicks[account],
+				'groups': ['self_contact'], 'subscription': 'both', 'ask': 'none'}
 		# .keys() is needed
 		for jid in array.keys():
 			# Remove the contact in roster. It might has changed
@@ -2058,9 +2070,10 @@ class RosterWindow:
 
 		elif contact.jid == gajim.get_jid_from_account(account) and \
 		show in ('offline', 'error'):
-			# SelfContact went offline. Remove him when last pending
-			# message was read
-			self.remove_contact(contact.jid, account, backend=True)
+			if gajim.config.get('show_self_contact') != 'never':
+				# SelfContact went offline. Remove him when last pending
+				# message was read
+				self.remove_contact(contact.jid, account, backend=True)
 
 		uf_show = helpers.get_uf_show(show)
 
@@ -2087,13 +2100,20 @@ class RosterWindow:
 		self.adjust_and_draw_contact_context(contact.jid, account)
 
 
-	def on_status_changed(self, account, status):
+	def on_status_changed(self, account, show):
 		'''the core tells us that our status has changed'''
 		if account not in gajim.contacts.get_accounts():
 			return
 		child_iterA = self._get_account_iter(account, self.model)
+		if gajim.config.get('show_self_contact') == 'always':
+			self_resource = gajim.connections[account].server_resource
+			self_contact = gajim.contacts.get_contact(account,
+				gajim.get_jid_from_account(account), resource=self_resource)
+			if self_contact:
+				status = gajim.connections[account].status
+				self.chg_contact_status(self_contact, show, status, account)
 		self.set_account_status_icon(account)
-		if status == 'offline':
+		if show == 'offline':
 			if self.quit_on_next_offline > -1:
 				# we want to quit, we are waiting for all accounts to be offline
 				self.quit_on_next_offline -= 1
@@ -2137,7 +2157,7 @@ class RosterWindow:
 			return
 
 		dlg = dialogs.ChangeStatusMessageDialog(on_response, show, show_pep)
-		dlg.window.present() # show it on current workspace
+		dlg.dialog.present() # show it on current workspace
 
 	def change_status(self, widget, account, status):
 		def change(account, status):
@@ -4015,7 +4035,7 @@ class RosterWindow:
 		path_dest, position = drop_info
 
 		if position == gtk.TREE_VIEW_DROP_BEFORE and len(path_dest) == 2 \
-			and path_dest[1] == 0: # dropped before the first group
+		and path_dest[1] == 0: # dropped before the first group
 			return
 		if position == gtk.TREE_VIEW_DROP_BEFORE and len(path_dest) == 2:
 			# dropped before a group: we drop it in the previous group every time
@@ -4155,19 +4175,29 @@ class RosterWindow:
 			return
 
 		# Is the contact we drag a meta contact?
-		accounts = (self.regroup and gajim.contacts.get_accounts()) or account_source
-		is_big_brother = gajim.contacts.is_big_brother(account_source, jid_source, accounts)
-
-		# Contact drop on group row or between two contacts
-		if type_dest == 'group' or position == gtk.TREE_VIEW_DROP_BEFORE or \
-				position == gtk.TREE_VIEW_DROP_AFTER:
+		accounts = (self.regroup and gajim.contacts.get_accounts()) or \
+			account_source
+		is_big_brother = gajim.contacts.is_big_brother(account_source, jid_source,
+			accounts)
+
+		drop_in_middle_of_meta = False
+		if type_dest == 'contact':
+			if position == gtk.TREE_VIEW_DROP_BEFORE and len(path_dest) == 4:
+				drop_in_middle_of_meta = True
+			if position == gtk.TREE_VIEW_DROP_AFTER and (len(path_dest) == 4 or \
+			self.modelfilter.iter_has_child(iter_dest)):
+				drop_in_middle_of_meta = True
+		# Contact drop on group row or between two contacts that are
+		# not metacontacts
+		if (type_dest == 'group' or position in (gtk.TREE_VIEW_DROP_BEFORE,
+		gtk.TREE_VIEW_DROP_AFTER)) and not drop_in_middle_of_meta:
 			self.on_drop_in_group(None, account_source, c_source, grp_dest,
 				is_big_brother, context, etime, grp_source)
 			return
 
 		# Contact drop on another contact, make meta contacts
 		if position == gtk.TREE_VIEW_DROP_INTO_OR_AFTER or \
-				position == gtk.TREE_VIEW_DROP_INTO_OR_BEFORE:
+		position == gtk.TREE_VIEW_DROP_INTO_OR_BEFORE or drop_in_middle_of_meta:
 			c_dest = gajim.contacts.get_contact_with_highest_priority(account_dest,
 				jid_dest)
 			if not c_dest:
@@ -4191,8 +4221,6 @@ class RosterWindow:
 			menu.connect('selection-done', gtkgui_helpers.destroy_widget)
 			menu.show_all()
 			menu.popup(None, None, None, 1, etime)
-#			self.on_drop_in_contact(treeview, account_source, c_source,
-#				account_dest, c_dest, is_big_brother, context, etime)
 
 ################################################################################
 ### Everything about images and icons....
@@ -5231,7 +5259,7 @@ class RosterWindow:
 			if muc_icon:
 				invite_menuitem.set_image(muc_icon)
 
-			self.build_invite_submenu(invite_menuitem, list_online)
+			gui_menu_builder.build_invite_submenu(invite_menuitem, list_online)
 			menu.append(invite_menuitem)
 
 			# Send Custom Status
@@ -5338,373 +5366,11 @@ class RosterWindow:
 		jid = model[titer][C_JID].decode('utf-8')
 		tree_path = model.get_path(titer)
 		account = model[titer][C_ACCOUNT].decode('utf-8')
-		our_jid = jid == gajim.get_jid_from_account(account)
 		contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
-		if not contact:
-			return
-
-		# Zeroconf Account
-		if gajim.config.get_per('accounts', account, 'is_zeroconf'):
-			xml = gtkgui_helpers.get_glade('zeroconf_contact_context_menu.glade')
-			zeroconf_contact_context_menu = xml.get_widget(
-				'zeroconf_contact_context_menu')
-
-			start_chat_menuitem = xml.get_widget('start_chat_menuitem')
-			execute_command_menuitem = xml.get_widget('execute_command_menuitem')
-			rename_menuitem = xml.get_widget('rename_menuitem')
-			edit_groups_menuitem = xml.get_widget('edit_groups_menuitem')
-			send_file_menuitem = xml.get_widget('send_file_menuitem')
-			assign_openpgp_key_menuitem = xml.get_widget(
-				'assign_openpgp_key_menuitem')
-			add_special_notification_menuitem = xml.get_widget(
-				'add_special_notification_menuitem')
-
-			# add a special img for send file menuitem
-			path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-				'upload.png')
-			img = gtk.Image()
-			img.set_from_file(path_to_upload_img)
-			send_file_menuitem.set_image(img)
-
-			if not our_jid:
-				# add a special img for rename menuitem
-				path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-					'kbd_input.png')
-				img = gtk.Image()
-				img.set_from_file(path_to_kbd_input_img)
-				rename_menuitem.set_image(img)
-
-			above_information_separator = xml.get_widget(
-				'above_information_separator')
-
-			information_menuitem = xml.get_widget('information_menuitem')
-			history_menuitem = xml.get_widget('history_menuitem')
-
-			contacts = gajim.contacts.get_contacts(account, jid)
-			if len(contacts) > 1: # several resources
-				sub_menu = gtk.Menu()
-				start_chat_menuitem.set_submenu(sub_menu)
-
-				iconset = gajim.config.get('iconset')
-				path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
-				for c in contacts:
-					# icon MUST be different instance for every item
-					state_images = gtkgui_helpers.load_iconset(path)
-					item = gtk.ImageMenuItem('%s (%s)' % (c.resource,
-						str(c.priority)))
-					icon_name = helpers.get_icon_name_to_show(c, account)
-					icon = state_images[icon_name]
-					item.set_image(icon)
-					sub_menu.append(item)
-					item.connect('activate', gajim.interface.on_open_chat_window, \
-						c, account,	c.resource)
-
-			else: # one resource
-				start_chat_menuitem.connect('activate',
-					self.on_roster_treeview_row_activated, tree_path)
-
-			if gajim.capscache.is_supported(contact, NS_FILE):
-				send_file_menuitem.set_sensitive(True)
-				send_file_menuitem.connect('activate',
-					self.on_send_file_menuitem_activate, contact, account)
-			else:
-				send_file_menuitem.set_sensitive(False)
-
-			execute_command_menuitem.connect('activate',
-				self.on_execute_command, contact, account)
-
-			rename_menuitem.connect('activate', self.on_rename, 'contact', jid,
-				account)
-			if contact.show in ('offline', 'error'):
-				information_menuitem.set_sensitive(False)
-				send_file_menuitem.set_sensitive(False)
-			else:
-				information_menuitem.connect('activate', self.on_info_zeroconf,
-					contact, account)
-			history_menuitem.connect('activate', self.on_history, contact,
-				account)
-
-			if _('Not in Roster') not in contact.get_shown_groups():
-				# contact is in normal group
-				edit_groups_menuitem.set_no_show_all(False)
-				assign_openpgp_key_menuitem.set_no_show_all(False)
-				edit_groups_menuitem.connect('activate', self.on_edit_groups, [(
-					contact,account)])
-
-				if gajim.connections[account].gpg:
-					assign_openpgp_key_menuitem.connect('activate',
-						self.on_assign_pgp_key, contact, account)
-				else:
-					assign_openpgp_key_menuitem.set_sensitive(False)
-
-			else: # contact is in group 'Not in Roster'
-				edit_groups_menuitem.set_sensitive(False)
-				edit_groups_menuitem.set_no_show_all(True)
-				assign_openpgp_key_menuitem.set_sensitive(False)
-
-			# Remove many items when it's self contact row
-			if our_jid:
-				for menuitem in (rename_menuitem, edit_groups_menuitem,
-				above_information_separator):
-					menuitem.set_no_show_all(True)
-					menuitem.hide()
-
-			# Unsensitive many items when account is offline
-			if gajim.connections[account].connected < 2:
-				for widget in (start_chat_menuitem,	rename_menuitem,
-				edit_groups_menuitem, send_file_menuitem):
-					widget.set_sensitive(False)
-
-			event_button = gtkgui_helpers.get_possible_button_event(event)
-
-			zeroconf_contact_context_menu.attach_to_widget(self.tree, None)
-			zeroconf_contact_context_menu.connect('selection-done',
-				gtkgui_helpers.destroy_widget)
-			zeroconf_contact_context_menu.show_all()
-			zeroconf_contact_context_menu.popup(None, None, None, event_button,
-				event.time)
-			return
-
-		# normal account
-		xml = gtkgui_helpers.get_glade('roster_contact_context_menu.glade')
-		roster_contact_context_menu = xml.get_widget(
-			'roster_contact_context_menu')
-
-		start_chat_menuitem = xml.get_widget('start_chat_menuitem')
-		send_custom_status_menuitem = xml.get_widget(
-			'send_custom_status_menuitem')
-		send_single_message_menuitem = xml.get_widget(
-			'send_single_message_menuitem')
-		invite_menuitem = xml.get_widget('invite_menuitem')
-		block_menuitem = xml.get_widget('block_menuitem')
-		unblock_menuitem = xml.get_widget('unblock_menuitem')
-		ignore_menuitem = xml.get_widget('ignore_menuitem')
-		unignore_menuitem = xml.get_widget('unignore_menuitem')
-		rename_menuitem = xml.get_widget('rename_menuitem')
-		edit_groups_menuitem = xml.get_widget('edit_groups_menuitem')
-		send_file_menuitem = xml.get_widget('send_file_menuitem')
-		assign_openpgp_key_menuitem = xml.get_widget(
-			'assign_openpgp_key_menuitem')
-		set_custom_avatar_menuitem = xml.get_widget('set_custom_avatar_menuitem')
-		add_special_notification_menuitem = xml.get_widget(
-			'add_special_notification_menuitem')
-		execute_command_menuitem = xml.get_widget(
-			'execute_command_menuitem')
-
-		# add a special img for send file menuitem
-		path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png')
-		img = gtk.Image()
-		img.set_from_file(path_to_upload_img)
-		send_file_menuitem.set_image(img)
-
-		# send custom status icon
-		blocked = False
-		if helpers.jid_is_blocked(account, jid):
-			blocked = True
-		else:
-			for group in contact.get_shown_groups():
-				if helpers.group_is_blocked(account, group):
-					blocked = True
-					break
-		if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
-			# Transport contact, send custom status unavailable
-			send_custom_status_menuitem.set_sensitive(False)
-		elif blocked:
-			send_custom_status_menuitem.set_image( \
-				gtkgui_helpers.load_icon('offline'))
-			send_custom_status_menuitem.set_sensitive(False)
-		elif account in gajim.interface.status_sent_to_users and \
-		jid in gajim.interface.status_sent_to_users[account]:
-			send_custom_status_menuitem.set_image(
-				gtkgui_helpers.load_icon( \
-					gajim.interface.status_sent_to_users[account][jid]))
-		else:
-			icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_MENU)
-			send_custom_status_menuitem.set_image(icon)
-
-		if not our_jid:
-			# add a special img for rename menuitem
-			path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps',
-				'kbd_input.png')
-			img = gtk.Image()
-			img.set_from_file(path_to_kbd_input_img)
-			rename_menuitem.set_image(img)
-
-		muc_icon = gtkgui_helpers.load_icon('muc_active')
-		if muc_icon:
-			invite_menuitem.set_image(muc_icon)
-
-		self.build_invite_submenu(invite_menuitem, [(contact, account)])
-
-		# Subscription submenu
-		subscription_menuitem = xml.get_widget('subscription_menuitem')
-		send_auth_menuitem, ask_auth_menuitem, revoke_auth_menuitem =\
-			subscription_menuitem.get_submenu().get_children()
-		add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem')
-		remove_from_roster_menuitem = xml.get_widget(
-			'remove_from_roster_menuitem')
-
-		information_menuitem = xml.get_widget('information_menuitem')
-		history_menuitem = xml.get_widget('history_menuitem')
-
-		contacts = gajim.contacts.get_contacts(account, jid)
-
-		# One or several resource, we do the same for send_custom_status
-		status_menuitems = gtk.Menu()
-		send_custom_status_menuitem.set_submenu(status_menuitems)
-		iconset = gajim.config.get('iconset')
-		path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
-		for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'):
-			# icon MUST be different instance for every item
-			state_images = gtkgui_helpers.load_iconset(path)
-			status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s))
-			status_menuitem.connect('activate', self.on_send_custom_status,
-				[(contact, account)], s)
-			icon = state_images[s]
-			status_menuitem.set_image(icon)
-			status_menuitems.append(status_menuitem)
-		if len(contacts) > 1: # several resources
-			start_chat_menuitem.set_submenu(self.build_resources_submenu(contacts,
-				account, gajim.interface.on_open_chat_window))
-			send_file_menuitem.set_submenu(self.build_resources_submenu(contacts,
-				account, self.on_send_file_menuitem_activate,
-				cap=NS_FILE))
-			execute_command_menuitem.set_submenu(self.build_resources_submenu(
-				contacts, account, self.on_execute_command,
-				cap=NS_COMMANDS))
-
-		else: # one resource
-			start_chat_menuitem.connect('activate',
-				gajim.interface.on_open_chat_window, contact, account)
-			if gajim.capscache.is_supported(contact, NS_COMMANDS):
-				execute_command_menuitem.set_sensitive(True)
-				execute_command_menuitem.connect('activate', self.on_execute_command,
-					contact, account, contact.resource)
-			else:
-				execute_command_menuitem.set_sensitive(False)
-
-			# This does nothing:
-			# our_jid_other_resource = None
-			# if our_jid:
-			# 	# It's another resource of us, be sure to send invite to her
-			# 	our_jid_other_resource = contact.resource
-			# Else this var is useless but harmless in next connect calls
-
-			if gajim.capscache.is_supported(contact, NS_FILE):
-				send_file_menuitem.set_sensitive(True)
-				send_file_menuitem.connect('activate',
-					self.on_send_file_menuitem_activate, contact, account)
-			else:
-				send_file_menuitem.set_sensitive(False)
-
-		send_single_message_menuitem.connect('activate',
-			self.on_send_single_message_menuitem_activate, account, contact)
-
-		rename_menuitem.connect('activate', self.on_rename, 'contact', jid,
-			account)
-		remove_from_roster_menuitem.connect('activate', self.on_req_usub,
-			[(contact, account)])
-		information_menuitem.connect('activate', self.on_info, contact,
-			account)
-		history_menuitem.connect('activate', self.on_history, contact,
-			account)
-
-		if _('Not in Roster') not in contact.get_shown_groups():
-			# contact is in normal group
-			add_to_roster_menuitem.hide()
-			add_to_roster_menuitem.set_no_show_all(True)
-			edit_groups_menuitem.connect('activate', self.on_edit_groups, [(
-				contact,account)])
-
-			if gajim.connections[account].gpg:
-				assign_openpgp_key_menuitem.connect('activate',
-					self.on_assign_pgp_key, contact, account)
-			else:
-				assign_openpgp_key_menuitem.set_sensitive(False)
-
-			if contact.sub in ('from', 'both'):
-				send_auth_menuitem.set_sensitive(False)
-			else:
-				send_auth_menuitem.connect('activate', self.authorize, jid, account)
-			if contact.sub in ('to', 'both'):
-				ask_auth_menuitem.set_sensitive(False)
-				add_special_notification_menuitem.connect('activate',
-					self.on_add_special_notification_menuitem_activate, jid)
-			else:
-				ask_auth_menuitem.connect('activate', self.req_sub, jid,
-					_('I would like to add you to my roster'), account,
-					contact.groups, contact.name)
-			if contact.sub in ('to', 'none') or gajim.get_transport_name_from_jid(
-			jid, use_config_setting=False):
-				revoke_auth_menuitem.set_sensitive(False)
-			else:
-				revoke_auth_menuitem.connect('activate', self.revoke_auth, jid,
-					account)
-
-		else: # contact is in group 'Not in Roster'
-			add_to_roster_menuitem.set_no_show_all(False)
-			edit_groups_menuitem.set_sensitive(False)
-			assign_openpgp_key_menuitem.set_sensitive(False)
-			subscription_menuitem.set_sensitive(False)
-
-			add_to_roster_menuitem.connect('activate',
-				self.on_add_to_roster, contact, account)
-
-		set_custom_avatar_menuitem.connect('activate',
-			self.on_set_custom_avatar_activate, contact, account)
-		# Hide items when it's self contact row
-		if our_jid:
-			menuitem = xml.get_widget('manage_contact')
-			menuitem.set_sensitive(False)
-
-		# Unsensitive many items when account is offline
-		if gajim.connections[account].connected < 2:
-			for widget in (start_chat_menuitem, send_single_message_menuitem,
-			rename_menuitem, edit_groups_menuitem, send_file_menuitem,
-			subscription_menuitem, add_to_roster_menuitem,
-			remove_from_roster_menuitem, execute_command_menuitem,
-			send_custom_status_menuitem):
-				widget.set_sensitive(False)
-
-		if gajim.connections[account] and gajim.connections[account].\
-		privacy_rules_supported:
-			if helpers.jid_is_blocked(account, jid):
-				block_menuitem.set_no_show_all(True)
-				block_menuitem.hide()
-				if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
-					unblock_menuitem.set_no_show_all(True)
-					unblock_menuitem.hide()
-					unignore_menuitem.set_no_show_all(False)
-					unignore_menuitem.connect('activate', self.on_unblock, [(contact,
-						account)])
-				else:
-					unblock_menuitem.connect('activate', self.on_unblock, [(contact,
-						account)])
-			else:
-				unblock_menuitem.set_no_show_all(True)
-				unblock_menuitem.hide()
-				if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
-					block_menuitem.set_no_show_all(True)
-					block_menuitem.hide()
-					ignore_menuitem.set_no_show_all(False)
-					ignore_menuitem.connect('activate', self.on_block, [(contact,
-						account)])
-				else:
-					block_menuitem.connect('activate', self.on_block, [(contact,
-						account)])
-		else:
-			unblock_menuitem.set_no_show_all(True)
-			block_menuitem.set_sensitive(False)
-			unblock_menuitem.hide()
-
+		menu = gui_menu_builder.get_contact_menu(contact, account)
 		event_button = gtkgui_helpers.get_possible_button_event(event)
-
-		roster_contact_context_menu.attach_to_widget(self.tree, None)
-		roster_contact_context_menu.connect('selection-done',
-			gtkgui_helpers.destroy_widget)
-		roster_contact_context_menu.show_all()
-		roster_contact_context_menu.popup(None, None, None, event_button,
-			event.time)
+		menu.attach_to_widget(self.tree, None)
+		menu.popup(None, None, None, event_button, event.time)
 
 	def make_multiple_contact_menu(self, event, iters):
 		'''Make group's popup menu'''
@@ -5748,7 +5414,7 @@ class RosterWindow:
 		if muc_icon:
 			invite_item.set_image(muc_icon)
 
-		self.build_invite_submenu(invite_item, list_)
+		gui_menu_builder.build_invite_submenu(invite_item, list_)
 		menu.append(invite_item)
 
 		item = gtk.SeparatorMenuItem() # separator
@@ -5993,120 +5659,6 @@ class RosterWindow:
 		menu.show_all()
 		menu.popup(None, None, None, event_button, event.time)
 
-	def build_resources_submenu(self, contacts, account, action, room_jid=None,
-	room_account=None, cap=None):
-		''' Build a submenu with contact's resources.
-		room_jid and room_account are for action self.on_invite_to_room '''
-		sub_menu = gtk.Menu()
-
-		iconset = gajim.config.get('iconset')
-		if not iconset:
-			iconset = gajim.config.DEFAULT_ICONSET
-		path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
-		for c in contacts:
-			# icon MUST be different instance for every item
-			state_images = gtkgui_helpers.load_iconset(path)
-			item = gtk.ImageMenuItem('%s (%s)' % (c.resource, str(c.priority)))
-			icon_name = helpers.get_icon_name_to_show(c, account)
-			icon = state_images[icon_name]
-			item.set_image(icon)
-			sub_menu.append(item)
-			if action == self.on_invite_to_room:
-				item.connect('activate', action, [(c, account)],
-					room_jid, room_account, c.resource)
-			elif action == self.on_invite_to_new_room:
-				item.connect('activate', action, [(c, account)], c.resource)
-			else: # start_chat, execute_command, send_file
-				item.connect('activate', action, c, account, c.resource)
-			if cap and \
-			not gajim.capscache.is_supported(c, cap):
-				item.set_sensitive(False)
-		return sub_menu
-
-	def build_invite_submenu(self, invite_menuitem, list_):
-		'''list_ in a list of (contact, account)'''
-		# used if we invite only one contact with several resources
-		contact_list = []
-		if len(list_) == 1:
-			contact, account = list_[0]
-			contact_list = gajim.contacts.get_contacts(account, contact.jid)
-		contacts_transport = -1
-		connected_accounts = []
-		# -1 is at start, False when not from the same, None when jabber
-		for (contact, account) in list_:
-			if not account in connected_accounts:
-				connected_accounts.append(account)
-			transport = gajim.get_transport_name_from_jid(contact.jid)
-			if contacts_transport == -1:
-				contacts_transport = transport
-			elif contacts_transport != transport:
-				contacts_transport = False
-
-		if contacts_transport == False:
-			# they are not all from the same transport
-			invite_menuitem.set_sensitive(False)
-			return
-		invite_to_submenu = gtk.Menu()
-		invite_menuitem.set_submenu(invite_to_submenu)
-		invite_to_new_room_menuitem = gtk.ImageMenuItem(_('_New Group Chat'))
-		icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU)
-		invite_to_new_room_menuitem.set_image(icon)
-		if len(contact_list) > 1: # several resources
-			invite_to_new_room_menuitem.set_submenu(self.build_resources_submenu(
-				contact_list, account, self.on_invite_to_new_room, cap=NS_MUC))
-		elif len(list_) == 1 and gajim.capscache.is_supported(contact, NS_MUC):
-			invite_menuitem.set_sensitive(True)
-			# use resource if it's self contact
-			if contact.jid == gajim.get_jid_from_account(account):
-				resource = contact.resource
-			else:
-				resource = None
-			invite_to_new_room_menuitem.connect('activate',
-				self.on_invite_to_new_room, list_, resource)
-		else:
-			invite_menuitem.set_sensitive(False)
-		# transform None in 'jabber'
-		c_t = contacts_transport or 'jabber'
-		muc_jid = {}
-		for account in connected_accounts:
-			for t in gajim.connections[account].muc_jid:
-				muc_jid[t] = gajim.connections[account].muc_jid[t]
-		if c_t not in muc_jid:
-			invite_to_new_room_menuitem.set_sensitive(False)
-		rooms = [] # a list of (room_jid, account) tuple
-		invite_to_submenu.append(invite_to_new_room_menuitem)
-		rooms = [] # a list of (room_jid, account) tuple
-		minimized_controls = []
-		for account in connected_accounts:
-			minimized_controls += \
-				gajim.interface.minimized_controls[account].values()
-		for gc_control in gajim.interface.msg_win_mgr.get_controls(
-		message_control.TYPE_GC) + minimized_controls:
-			acct = gc_control.account
-			room_jid = gc_control.room_jid
-			if room_jid in gajim.gc_connected[acct] and \
-			gajim.gc_connected[acct][room_jid] and \
-			contacts_transport == gajim.get_transport_name_from_jid(room_jid):
-				rooms.append((room_jid, acct))
-		if len(rooms):
-			item = gtk.SeparatorMenuItem() # separator
-			invite_to_submenu.append(item)
-			for (room_jid, account) in rooms:
-				menuitem = gtk.MenuItem(room_jid.split('@')[0])
-				if len(contact_list) > 1: # several resources
-					menuitem.set_submenu(self.build_resources_submenu(
-						contact_list, account, self.on_invite_to_room, room_jid,
-						account))
-				else:
-					# use resource if it's self contact
-					if contact.jid == gajim.get_jid_from_account(account):
-						resource = contact.resource
-					else:
-						resource = None
-					menuitem.connect('activate', self.on_invite_to_room, list_,
-						room_jid, account, resource)
-				invite_to_submenu.append(menuitem)
-
 	def get_and_connect_advanced_menuitem_menu(self, account):
 		'''adds FOR ACCOUNT options'''
 		xml = gtkgui_helpers.get_glade('advanced_menuitem_menu.glade')
diff --git a/src/systray.py b/src/systray.py
index 72d60b919..e2c09331b 100644
--- a/src/systray.py
+++ b/src/systray.py
@@ -399,7 +399,7 @@ class Systray:
 				gajim.interface.roster.send_status(acct, show, message)
 				gajim.interface.roster.send_pep(acct, pep_dict)
 		dlg = dialogs.ChangeStatusMessageDialog(on_response, status)
-		dlg.window.present()
+		dlg.dialog.present()
 
 	def show_tooltip(self, widget):
 		position = widget.window.get_origin()