[commit-gajim] r11255 - in branches/osx_newbuildsys: . data/glade data/other debian po src src/common src/common/xmpp src/common/zeroconf test test/lib

js at gajim.org js at gajim.org
Thu Apr 30 19:06:00 CEST 2009


Author: js
Date: 2009-04-30 19:05:59 +0200 (Thu, 30 Apr 2009)
New Revision: 11255

Modified:
   branches/osx_newbuildsys/README.html
   branches/osx_newbuildsys/configure.ac
   branches/osx_newbuildsys/data/glade/accounts_window.glade
   branches/osx_newbuildsys/data/glade/change_status_message_dialog.glade
   branches/osx_newbuildsys/data/other/servers.xml
   branches/osx_newbuildsys/debian/control
   branches/osx_newbuildsys/debian/copyright
   branches/osx_newbuildsys/po/de.po
   branches/osx_newbuildsys/po/pl.po
   branches/osx_newbuildsys/po/uk.po
   branches/osx_newbuildsys/src/advanced.py
   branches/osx_newbuildsys/src/chat_control.py
   branches/osx_newbuildsys/src/common/caps.py
   branches/osx_newbuildsys/src/common/config.py
   branches/osx_newbuildsys/src/common/connection.py
   branches/osx_newbuildsys/src/common/connection_handlers.py
   branches/osx_newbuildsys/src/common/contacts.py
   branches/osx_newbuildsys/src/common/defs.py
   branches/osx_newbuildsys/src/common/helpers.py
   branches/osx_newbuildsys/src/common/logger.py
   branches/osx_newbuildsys/src/common/optparser.py
   branches/osx_newbuildsys/src/common/pep.py
   branches/osx_newbuildsys/src/common/xmpp/simplexml.py
   branches/osx_newbuildsys/src/common/xmpp/transports_nb.py
   branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py
   branches/osx_newbuildsys/src/config.py
   branches/osx_newbuildsys/src/conversation_textview.py
   branches/osx_newbuildsys/src/dataforms_widget.py
   branches/osx_newbuildsys/src/dialogs.py
   branches/osx_newbuildsys/src/features_window.py
   branches/osx_newbuildsys/src/gajim.py
   branches/osx_newbuildsys/src/groupchat_control.py
   branches/osx_newbuildsys/src/gtkgui_helpers.py
   branches/osx_newbuildsys/src/history_window.py
   branches/osx_newbuildsys/src/htmltextview.py
   branches/osx_newbuildsys/src/message_control.py
   branches/osx_newbuildsys/src/message_window.py
   branches/osx_newbuildsys/src/notify.py
   branches/osx_newbuildsys/src/roster_window.py
   branches/osx_newbuildsys/src/session.py
   branches/osx_newbuildsys/src/systray.py
   branches/osx_newbuildsys/src/tooltips.py
   branches/osx_newbuildsys/src/vcard.py
   branches/osx_newbuildsys/test/lib/mock.py
   branches/osx_newbuildsys/test/lib/xmpp_mocks.py
   branches/osx_newbuildsys/test/runtests.py
   branches/osx_newbuildsys/test/test_resolver.py
   branches/osx_newbuildsys/test/test_xmpp_client_nb.py
   branches/osx_newbuildsys/test/test_xmpp_dispatcher_nb.py
   branches/osx_newbuildsys/test/test_xmpp_transports_nb.py
Log:
Merge trunk r11254.


Modified: branches/osx_newbuildsys/README.html
===================================================================
--- branches/osx_newbuildsys/README.html	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/README.html	2009-04-30 17:05:59 UTC (rev 11255)
@@ -15,8 +15,8 @@
 
 <h2>Runtime Requirements</h2>
 <ul>
-<li>python2.4 or higher</li>
-<li>pygtk2.8 or higher</li>
+<li>python2.5 or higher</li>
+<li>pygtk2.12 or higher</li>
 <li>python-libglade</li>
 <li>pysqlite2 (if you have python 2.5, you already have this)</li>
 </ul>
@@ -56,7 +56,7 @@
 <li>libgtk2.0-dev aka. gtk2-devel</li>
 <li>libgtkspell-dev	(for the gtkspell module)</li>
 <li>libdbus-1-dev	(for the remote control module)</li>
-<li>intltool</li>
+<li>intltool (>= 0.40.1)</li>
 </ul>
 
 <p>
@@ -96,7 +96,7 @@
 <li>automake &gt;= 1.8 </li>
 <li>autoconf &gt;= 2.59 </li>
 <li>libtool</li>
-<li>intltool-0.35.0 </li>
+<li>intltool-0.40.1 </li>
 <li>pkgconfig &gt;= 0.19</li>
 </ul>
 </p>
@@ -143,7 +143,7 @@
 <br/>
 <br/>
 <br/>
-(C) 2003-2008<br/>
+(C) 2003-200888888888<br/>
 The Gajim Team<br/>
 http://gajim.org<br/>
 <br/>

Modified: branches/osx_newbuildsys/configure.ac
===================================================================
--- branches/osx_newbuildsys/configure.ac	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/configure.ac	2009-04-30 17:05:59 UTC (rev 11255)
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.12.1.2-svn],[http://trac.gajim.org/],[gajim])
+		[0.12.1.3-svn],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_SRCDIR(src)

Modified: branches/osx_newbuildsys/data/glade/accounts_window.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/accounts_window.glade	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/data/glade/accounts_window.glade	2009-04-30 17:05:59 UTC (rev 11255)
@@ -7,8 +7,8 @@
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Accounts</property>
     <property name="default_width">700</property>
-    <signal name="key_press_event" handler="on_accounts_window_key_press_event"/>
     <signal name="destroy" handler="on_accounts_window_destroy"/>
+    <signal name="key_press_event" handler="on_accounts_window_key_press_event"/>
     <child>
       <widget class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -39,7 +39,6 @@
                         <property name="can_focus">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="headers_visible">False</property>
-                        <property name="headers_clickable">True</property>
                         <signal name="cursor_changed" handler="on_accounts_treeview_cursor_changed"/>
                       </widget>
                     </child>
@@ -178,32 +177,138 @@
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkEntry" id="resource_entry1">
+                          <widget class="GtkLabel" id="label2">
                             <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Jabber ID:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">jid_entry1</property>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label3">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Password:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">password_entry1</property>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="password_entry1">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)</property>
-                            <property name="text" translatable="yes">Gajim</property>
-                            <signal name="focus_out_event" handler="on_resource_entry1_focus_out_event"/>
+                            <property name="visibility">False</property>
+                            <property name="activates_default">True</property>
+                            <signal name="changed" handler="on_password_entry1_changed"/>
                           </widget>
                           <packing>
                             <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="save_password_checkbutton1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">If checked, Gajim will remember the password for this account</property>
+                            <property name="label" translatable="yes">Save pass_word</property>
+                            <property name="use_underline">True</property>
+                            <property name="focus_on_click">False</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_save_password_checkbutton1_toggled"/>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label4">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Resour_ce:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">resource_entry1</property>
+                          </widget>
+                          <packing>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                            <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="jid_entry1">
+                          <widget class="GtkLabel" id="label5">
                             <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Priori_ty:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">priority_spinbutton1</property>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="adjust_priority_with_status_checkbutton1">
+                            <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="activates_default">True</property>
-                            <signal name="focus_out_event" handler="on_jid_entry1_focus_out_event"/>
+                            <property name="tooltip" translatable="yes">Priority will change automatically according to your status.</property>
+                            <property name="label" translatable="yes">A_djust to status</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_adjust_priority_with_status_checkbutton1_toggled"/>
                           </widget>
                           <packing>
                             <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkSpinButton" id="priority_spinbutton1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events</property>
+                            <property name="adjustment">5 0 127 1 5 0</property>
+                            <property name="climb_rate">1</property>
+                            <property name="numeric">True</property>
+                            <signal name="value_changed" handler="on_priority_spinbutton1_value_changed"/>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
@@ -266,141 +371,35 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" id="priority_spinbutton1">
+                          <widget class="GtkEntry" id="jid_entry1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events</property>
-                            <property name="adjustment">5 0 127 1 5 5</property>
-                            <property name="climb_rate">1</property>
-                            <property name="numeric">True</property>
-                            <signal name="value_changed" handler="on_priority_spinbutton1_value_changed"/>
+                            <property name="activates_default">True</property>
+                            <signal name="focus_out_event" handler="on_jid_entry1_focus_out_event"/>
                           </widget>
                           <packing>
-                            <property name="left_attach">2</property>
+                            <property name="left_attach">1</property>
                             <property name="right_attach">3</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="adjust_priority_with_status_checkbutton1">
+                          <widget class="GtkEntry" id="resource_entry1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Priority will change automatically according to your status.</property>
-                            <property name="label" translatable="yes">A_djust to status</property>
-                            <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="on_adjust_priority_with_status_checkbutton1_toggled"/>
+                            <property name="tooltip" translatable="yes">Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)</property>
+                            <property name="text" translatable="yes">Gajim</property>
+                            <signal name="focus_out_event" handler="on_resource_entry1_focus_out_event"/>
                           </widget>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label5">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Priori_ty:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">priority_spinbutton1</property>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label4">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Resour_ce:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">resource_entry1</property>
-                          </widget>
-                          <packing>
+                            <property name="right_attach">3</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkCheckButton" id="save_password_checkbutton1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">If checked, Gajim will remember the password for this account</property>
-                            <property name="label" translatable="yes">Save pass_word</property>
-                            <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
-                            <property name="response_id">0</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="on_save_password_checkbutton1_toggled"/>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkEntry" id="password_entry1">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="visibility">False</property>
-                            <property name="activates_default">True</property>
-                            <signal name="changed" handler="on_password_entry1_changed"/>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
-                        <child>
-                          <widget class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Password:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">password_entry1</property>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Jabber ID:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">jid_entry1</property>
-                          </widget>
-                          <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
                       </widget>
                     </child>
                     <child>
@@ -1067,125 +1066,6 @@
                             <property name="column_spacing">2</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkEntry" id="jabber_id_entry2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <signal name="changed" handler="on_jabber_id_entry2_changed"/>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label12">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Jabber ID:</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label13">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">E-Mail:</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">5</property>
-                                <property name="bottom_attach">6</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkEntry" id="email_entry2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <signal name="changed" handler="on_email_entry2_changed"/>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">5</property>
-                                <property name="bottom_attach">6</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label14">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Last Name:</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkEntry" id="last_name_entry2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <signal name="changed" handler="on_last_name_entry2_changed"/>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label15">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">First Name:</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkEntry" id="first_name_entry2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <signal name="changed" handler="on_first_name_entry2_changed"/>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label16">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Personal Information&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
-                              </widget>
-                              <packing>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
                               <widget class="GtkVBox" id="vbox10">
                                 <property name="visible">True</property>
                                 <property name="spacing">5</property>
@@ -1266,6 +1146,125 @@
                                 <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
+                            <child>
+                              <widget class="GtkLabel" id="label16">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Personal Information&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="first_name_entry2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <signal name="changed" handler="on_first_name_entry2_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label15">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">First Name:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="last_name_entry2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <signal name="changed" handler="on_last_name_entry2_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label14">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Last Name:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="email_entry2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <signal name="changed" handler="on_email_entry2_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">5</property>
+                                <property name="bottom_attach">6</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label13">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">E-Mail:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">5</property>
+                                <property name="bottom_attach">6</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label12">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Jabber ID:</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="jabber_id_entry2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <signal name="changed" handler="on_jabber_id_entry2_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
                           </widget>
                           <packing>
                             <property name="position">1</property>

Modified: branches/osx_newbuildsys/data/glade/change_status_message_dialog.glade
===================================================================
--- branches/osx_newbuildsys/data/glade/change_status_message_dialog.glade	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/data/glade/change_status_message_dialog.glade	2009-04-30 17:05:59 UTC (rev 11255)
@@ -1,312 +1,296 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
 <glade-interface>
-
-<widget class="GtkDialog" id="change_status_message_dialog">
-  <property name="border_width">6</property>
-  <property name="title" translatable="yes"></property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">270</property>
-  <property name="default_height">175</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="has_separator">True</property>
-  <signal name="key_press_event" handler="on_change_status_message_dialog_key_press_event" last_modification_time="Wed, 16 Mar 2005 00:53:06 GMT"/>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox5">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkFrame" id="frame38">
-	  <property name="visible">True</property>
-	  <property name="label_xalign">0</property>
-	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-	  <child>
-	    <widget class="GtkAlignment" id="alignment107">
-	      <property name="visible">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">1</property>
-	      <property name="yscale">1</property>
-	      <property name="top_padding">0</property>
-	      <property name="bottom_padding">0</property>
-	      <property name="left_padding">12</property>
-	      <property name="right_padding">0</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox112">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow24">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="shadow_type">GTK_SHADOW_IN</property>
-		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		      <child>
-			<widget class="GtkTextView" id="message_textview">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="has_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="overwrite">False</property>
-			  <property name="accepts_tab">True</property>
-			  <property name="justification">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap_mode">GTK_WRAP_WORD</property>
-			  <property name="cursor_visible">True</property>
-			  <property name="pixels_above_lines">0</property>
-			  <property name="pixels_below_lines">0</property>
-			  <property name="pixels_inside_wrap">0</property>
-			  <property name="left_margin">0</property>
-			  <property name="right_margin">0</property>
-			  <property name="indent">0</property>
-			  <property name="text" translatable="yes"></property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHButtonBox" id="hbuttonbox33">
-		      <property name="visible">True</property>
-		      <property name="layout_style">GTK_BUTTONBOX_END</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkButton" id="save_as_preset_button">
-			  <property name="visible">True</property>
-			  <property name="sensitive">False</property>
-			  <property name="can_default">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_save_as_preset_button_clicked" last_modification_time="Thu, 26 Jan 2006 17:31:47 GMT"/>
-
-			  <child>
-			    <widget class="GtkAlignment" id="alignment106">
-			      <property name="visible">True</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">0</property>
-			      <property name="yscale">0</property>
-			      <property name="top_padding">0</property>
-			      <property name="bottom_padding">0</property>
-			      <property name="left_padding">0</property>
-			      <property name="right_padding">0</property>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox3021">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">2</property>
-
-				  <child>
-				    <widget class="GtkImage" id="image1369">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-save-as</property>
-				      <property name="icon_size">4</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label380">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Save as Preset...</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox3022">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label165">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Preset messages:</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkComboBox" id="message_combobox">
-			  <property name="visible">True</property>
-			  <property name="add_tearoffs">False</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="changed" handler="on_message_combobox_changed" last_modification_time="Tue, 07 Mar 2006 13:25:23 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label383">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Type your new status message&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">label_item</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
+  <widget class="GtkDialog" id="change_status_message_dialog">
+    <property name="border_width">6</property>
+    <property name="default_width">270</property>
+    <property name="default_height">175</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <signal name="key_press_event" handler="on_change_status_message_dialog_key_press_event"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox5">
+        <property name="visible">True</property>
+        <property name="spacing">6</property>
+        <child>
+          <widget class="GtkFrame" id="frame38">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">GTK_SHADOW_NONE</property>
+            <child>
+              <widget class="GtkAlignment" id="alignment107">
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox112">
+                    <property name="visible">True</property>
+                    <property name="border_width">6</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="scrolledwindow24">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="shadow_type">GTK_SHADOW_IN</property>
+                        <child>
+                          <widget class="GtkTextView" id="message_textview">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="has_focus">True</property>
+                            <property name="wrap_mode">GTK_WRAP_WORD</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkHButtonBox" id="hbuttonbox33">
+                        <property name="visible">True</property>
+                        <property name="layout_style">GTK_BUTTONBOX_END</property>
+                        <child>
+                          <widget class="GtkButton" id="save_as_preset_button">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="can_default">True</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" handler="on_save_as_preset_button_clicked"/>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment106">
+                                <property name="visible">True</property>
+                                <property name="xscale">0</property>
+                                <property name="yscale">0</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox3021">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <widget class="GtkImage" id="image1369">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-save-as</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label380">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Save as Preset...</property>
+                                        <property name="use_underline">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkTable" id="under_table">
+                        <property name="visible">True</property>
+                        <property name="n_rows">3</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">6</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <widget class="GtkButton" id="mood_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" handler="on_mood_button_clicked"/>
+                            <child>
+                              <widget class="GtkHBox" id="hbox2">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkImage" id="mood_image">
+                                    <property name="visible">True</property>
+                                    <property name="stock">gtk-missing-image</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="mood_button_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="wrap">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkButton" id="activity_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" handler="on_activity_button_clicked"/>
+                            <child>
+                              <widget class="GtkHBox" id="hbox1">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkImage" id="activity_image">
+                                    <property name="visible">True</property>
+                                    <property name="stock">gtk-missing-image</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="activity_button_label">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="wrap">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="mood_label">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Mood:</property>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="activity_label">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Activity:</property>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkComboBox" id="message_combobox">
+                            <property name="visible">True</property>
+                            <signal name="changed" handler="on_message_combobox_changed"/>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label165">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Preset messages:</property>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label383">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Type your new status message&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="cancel_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-6</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="ok_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>

Modified: branches/osx_newbuildsys/data/other/servers.xml
===================================================================
--- branches/osx_newbuildsys/data/other/servers.xml	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/data/other/servers.xml	2009-04-30 17:05:59 UTC (rev 11255)
@@ -40,6 +40,9 @@
   <item jid="aszlig.net" name="">
     <active port="5222"/>
   </item>
+  <item jid="blabla.kz" name="">
+    <active port="5222"/>
+  </item>
   <item jid="bloodyxml.com" name="Hosted by Chote Networks (http://www.chote.com)">
     <active port="5222"/>
   </item>

Modified: branches/osx_newbuildsys/debian/control
===================================================================
--- branches/osx_newbuildsys/debian/control	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/debian/control	2009-04-30 17:05:59 UTC (rev 11255)
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Yann Le Boulanger <asterix at lagaule.org>
-Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext (>= 0.17-4), libxss-dev, intltool, imagemagick, python-central (>= 0.5), libdbus-1-dev
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext (>= 0.17-4), libxss-dev, intltool (>= 0.40.1), imagemagick, python-central (>= 0.5), libdbus-1-dev
 Build-Conflicts: python2.3
 XS-Python-Version: >= 2.4
 Standards-Version: 3.7.3
@@ -13,7 +13,7 @@
 Package: gajim
 Architecture: any
 XB-Python-Version: ${python:Versions}
-Depends: python (>= 2.4), python-support (>= 0.7.1), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.8.0), python-pysqlite2 | python (>= 2.5), dnsutils, libc6
+Depends: python (>= 2.4), python-support (>= 0.7.1), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.12.0), python-pysqlite2 | python (>= 2.5), dnsutils, libc6
 Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl
 Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0), gnome-keyring, python-sexy, python-kerberos (>= 1.1)
 Description: Jabber client written in PyGTK

Modified: branches/osx_newbuildsys/debian/copyright
===================================================================
--- branches/osx_newbuildsys/debian/copyright	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/debian/copyright	2009-04-30 17:05:59 UTC (rev 11255)
@@ -1,4 +1,4 @@
-This package was debianized by Yann L.B. asterix at lagaule.org on
+This package was debianized by Yann Leboulanger asterix at lagaule.org on
 Wed, 16 Jun 2005 20:00:00 +0100.
 
 It was downloaded from:
@@ -10,12 +10,11 @@
       - Travis Shirk <travis at pobox.com>
  
 
-Copyright: (c) 2003-2006 Gajim Team
+Copyright: (c) 2003-2009 Gajim Team
 
 This program 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; either version 2, or (at your option)
-any later version.
+the Free Software Foundation; version 3
  
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of

Modified: branches/osx_newbuildsys/po/de.po
===================================================================
--- branches/osx_newbuildsys/po/de.po	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/po/de.po	2009-04-30 17:05:59 UTC (rev 11255)
@@ -1,28 +1,34 @@
 # German translations for gajim package.
-# Copyright (C) 2005 THE gajim'S COPYRIGHT HOLDER
+# Copyright (C) 2009 THE gajim'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gajim package.
 # Fridtjof Busse <fridtjof at fbunet.de>, 2005, 2006.
 # Benjamin Drung <benjamin.drung at gmail.com>, 2007, 2008.
 # Fabian Fingerle <fabian at datensalat.eu>, 2007, 2008.
 # Sebastian Schäfer <sarek at uliweb.de>, 2007.
-# Nico Gulden <cilugnedon at gmx.de>, 2007, 2008.
-#
+# Nico Gulden <cilugnedon at gmx.de>, 2007, 2008, 2009.
+# Niklas Hambüchen <nh2 at deditus.de>, 2009.
+#. app_name (string)
+#. replaces_id (uint)
+#. event_id (string)
+#. app_icon (string)
+#: ../src/notify.py:560
 msgid ""
 msgstr ""
-"Project-Id-Version: gajim 0.11\n"
+"Project-Id-Version: gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-21 15:47+0100\n"
-"PO-Revision-Date: 2008-12-21 15:54+0100\n"
+"POT-Creation-Date: 2009-04-06 23:03+0200\n"
+"PO-Revision-Date: 2009-02-14 19:58+0100\n"
 "Last-Translator: Nico Gulden <cilugnedon at gmx.de>\n"
 "Language-Team: German <translators at gajim.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 0.2\n"
 
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
-msgstr "Ein GTK+ Jabber-Client"
+msgstr "Ein Jabber-Client in GTK+"
 
 #: ../data/gajim.desktop.in.in.h:2
 msgid "Gajim Instant Messenger"
@@ -35,20 +41,20 @@
 #: ../data/glade/account_context_menu.glade.h:1
 #: ../data/glade/roster_window.glade.h:7
 msgid "Join _Group Chat..."
-msgstr "_Chatraum beitreten ..."
+msgstr "_Gruppenchat betreten …"
 
 #: ../data/glade/account_context_menu.glade.h:2
 msgid "_Add Contact..."
-msgstr "Kontakt _hinzufügen ..."
+msgstr "Kont_akt hinzufügen …"
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Dienste durchsuchen"
 
 #: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
-msgstr "_Befehl ausführen ..."
+msgstr "B_efehl ausführen …"
 
 #: ../data/glade/account_context_menu.glade.h:5
 msgid "_Modify Account"
@@ -56,16 +62,16 @@
 
 #: ../data/glade/account_context_menu.glade.h:6
 msgid "_Open Gmail Inbox"
-msgstr "Google Mail Posteingang _öffnen"
+msgstr "Google-Mail-Posteingang _öffnen"
 
 #: ../data/glade/account_context_menu.glade.h:7
 msgid "_Personal Events"
 msgstr "_Persönliche Ereignisse"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
-msgstr "_Chat starten ..."
+msgstr "_Chat starten …"
 
 #: ../data/glade/account_context_menu.glade.h:9
 #: ../data/glade/zeroconf_context_menu.glade.h:2
@@ -80,7 +86,7 @@
 msgstr ""
 "<b>Zum Server verbinden</b>\n"
 "\n"
-"Bitte warten ..."
+"Bitte warten …"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:4
 msgid "<b>Please choose one of the options below:</b>"
@@ -88,13 +94,17 @@
 
 #: ../data/glade/account_creation_wizard_window.glade.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
-msgstr "<b>Bitte tragen Sie die Daten für ihr bestehendes Konto ein</b>"
+msgstr "<b>Bitte tragen Sie die Daten für Ihr bestehendes Konto ein</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Bitte einen Server wählen</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid "@"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -102,55 +112,53 @@
 "Dieses Zertifikat der Liste vertrauenswürdiger Zertifikate hinzufügen.\n"
 "SHA1-Fingerprint dieses Zertifikates:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
-msgstr "Verbinde, sobald ich Fertig klicke"
+msgstr "Verbinden, sobald ich auf Fertig klicke"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Assistent zum Einrichten eines Kontos"
+msgstr "Assistent zum Einrichten eines neuen Kontos"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "I already have an account I want to _use"
-msgstr "Ich habe bereits ein Konto, das ich _benutzen möchte"
+msgstr "Ich habe bereits ein Konto, das ich ben_utzen möchte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Ich möchte ein neues Konto _erstellen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 #: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:24
 msgid "If checked, Gajim will remember the password for this account"
-msgstr "Falls aktiviert, wird Gajim das Passwort für dieses Konto speichern"
+msgstr "Falls aktiviert, wird Gajim das Passwort für dieses Konto speichern."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
-msgstr "_Verwalten ..."
+msgstr "Verwalten …"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save pass_word"
 msgstr "Pass_wort speichern"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Set my profile when I connect"
 msgstr "Mein Profil setzen, wenn ich mich verbinde"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Benutzerdefinierten Rechnernamen und Port verwenden"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -158,12 +166,8 @@
 "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk \n"
 "verbinden können."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-msgid "Your JID:"
-msgstr "Ihre JID:"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Erweitert"
 
@@ -176,24 +180,25 @@
 msgstr "Rec_hnername:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
+msgid "_Jabber ID:"
+msgstr "_Jabber-ID:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 #: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:16
-msgid "_Username:"
-msgstr "_Benutzername:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -213,7 +218,7 @@
 msgstr "<b>Persönliche Informationen</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Konto"
 
@@ -222,65 +227,70 @@
 msgstr "Kontoänderung"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Administrative Aktionen"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:9
 msgid "Auto-reconnect when connection is lost"
-msgstr "Automatisch neu verbinden, wenn die Verbindung abbricht"
+msgstr "Automatisch neu verbinden, falls die Verbindung abbricht"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Beim Pr_ogrammstart verbinden"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:11
 msgid "Chan_ge Password"
 msgstr "Pass_wort ändern"
 
 #: ../data/glade/account_modification_window.glade.h:10
-msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-msgstr "Aktivieren Sie diese Option, damit Gajim auf Port 5223 verbindet, auf dem veraltete Server SSL-Fähigkeiten unterstützen. Beachten Sie, dass Gajim standardmäßig TLS-Verschlüsselung benutzt, wenn sie vom Server verwendet wird und sie TLS mit dieser Option deaktivieren"
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Aktivieren Sie diese Option, damit sich Gajim über Port 5223 verbindet, auf "
+"dem auch veraltete Server SSL-Fähigkeiten unterstützen. Beachten Sie, dass "
+"diese Option die neuere TLS-Verschlüsselung deaktiviert, die Gajim "
+"standardmäßig verwendet, wenn der Server sie unterstützt."
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:13
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
-msgstr "_Schlüssel wählen ..."
+msgstr "_Schlüssel wählen …"
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Click to change account's password"
-msgstr "Klicken, um das Konto-Passwort zu ändern"
+msgstr "Klicken, um das Konto-Passwort zu ändern."
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to request authorization to all contacts of another account"
-msgstr "Klicken, um alle Kontakte eines anderen Kontos um Authorisierung zu fragen"
+msgstr ""
+"Klicken, um alle Kontakte eines anderen Kontos um Autorisierung zu fragen."
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Connection"
 msgstr "Verbindung"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
-msgstr "Persönliche Informationen bearbeiten ..."
+msgstr "Persönliche Informationen bearbeiten …"
 
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/common/helpers.py:1034
-#: ../src/common/helpers.py:1046
-#: ../src/notify.py:515
-#: ../src/notify.py:551
-#: ../src/notify.py:563
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1155 ../src/notify.py:556 ../src/notify.py:577
+#: ../src/notify.py:616 ../src/notify.py:628
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -289,59 +299,76 @@
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98
-#: ../src/dialogs.py:103
-#: ../src/dialogs.py:111
-#: ../src/dialogs.py:166
-#: ../src/roster_window.py:2654
-#: ../src/roster_window.py:5137
+#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
+#: ../src/roster_window.py:2644 ../src/roster_window.py:5195
 msgid "General"
 msgstr "Allgemein"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
-msgstr "Servername: "
+msgstr "Server-Name: "
 
 #: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Falls aktiviert, wird Gajim von mehr als nur Ihrer eigenen IP senden, wodurch die Wahrscheinlichkeit einer erfolgreicher Dateiübertragung erhöht wird."
+#: ../data/glade/accounts_window.glade.h:22
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Falls aktiviert, sendet Gajim von mehreren anstatt von nur Ihrer eigenen IP-"
+"Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen Dateiübertragung "
+"erhöht wird."
 
 #: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Falls aktiviert, sendet Gajim regelmäßig Keepalive-Pakete, um einen Verbindungsabbruch durch eine Zeitüberschreitung zu verhindern"
+#: ../data/glade/accounts_window.glade.h:25
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Falls aktiviert, sendet Gajim regelmäßig Keepalive-Pakete, um einen "
+"Verbindungsabbruch durch eine Zeitüberschreitung zu verhindern."
 
 #: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Falls aktiviert, wird Gajim das Passwort mit ausschließlichen Lese-Rechten für Sie in ~/.gajim/config speichern"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Falls aktiviert, wird Gajim das Passwort mit ausschließlichen Lese-Rechten "
+"für Sie in ~/.gajim/config speichern."
 
 #: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Falls aktiviert, wird Gajim während des Startvorgangs automatisch zu diesem Konto verbinden"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Falls aktiviert, verbindet sich Gajim während des Startvorgangs automatisch "
+"mit diesem Konto."
 
 #: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../data/glade/accounts_window.glade.h:27
 #: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Falls aktiviert, wird jede Änderung des globalen Status (verwaltet von der Combobox am Fuße der Kontaktliste) auch den Status dieses Kontakts entsprechend ändern"
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"Falls aktiviert, wird mit jeder Änderung des globalen Status (verwaltet von "
+"der Auswahlbox unter der Kontaktliste) auch der Status dieses Kontos "
+"entsprechend geändert."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:30
 msgid "Information about you, as stored in the server"
-msgstr "Informationen über Sie, wie sie auf dem Server gespeichert sind"
+msgstr "Informationen über Sie, die auf dem Server gespeichert sind"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1611
-#: ../src/config.py:2111
+#: ../data/glade/accounts_window.glade.h:34
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1570
+#: ../src/config.py:2073
 msgid "No key selected"
 msgstr "Kein Schlüssel ausgewählt"
 
@@ -351,66 +378,72 @@
 #. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3
-#: ../src/config.py:1162
-#: ../src/config.py:1251
-#: ../src/config.py:1519
-#: ../src/config.py:1524
-#: ../src/config.py:2019
-#: ../src/config.py:2097
-#: ../src/config.py:2110
-#: ../src/config.py:3201
-#: ../src/config.py:3269
-#: ../src/dialogs.py:294
-#: ../src/dialogs.py:296
-#: ../src/dialogs.py:522
-#: ../src/roster_window.py:2723
-#: ../src/roster_window.py:2729
-#: ../src/roster_window.py:2734
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1118
+#: ../src/config.py:1207 ../src/config.py:1475 ../src/config.py:1480
+#: ../src/config.py:1981 ../src/config.py:2059 ../src/config.py:2072
+#: ../src/config.py:3161 ../src/config.py:3229 ../src/dialogs.py:293
+#: ../src/dialogs.py:295 ../src/dialogs.py:523 ../src/roster_window.py:2714
+#: ../src/roster_window.py:2720 ../src/roster_window.py:2725
 msgid "None"
-msgstr "Kein"
+msgstr "Kein Proxy"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:37
 #: ../data/glade/profile_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Persönliche Informationen"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:38
 msgid "Priori_ty:"
 msgstr "Priori_tät:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
-msgstr "Die Priorität wird von Jabber verwendet, um festzustellen, wer die Ereignisse des Jabber-Servers bekommt, wenn zwei oder mehr Clients mit dem selben Konto verbunden sind. Der Client mit der höchsten Priorität bekommt die Ereignisse."
+#: ../data/glade/accounts_window.glade.h:39
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Die Priorität legt fest, an welchen Client der Jabber-Server neue "
+"Nachrichten sendet, wenn zwei oder mehr Clients mit demselben Konto "
+"verbunden sind. Der Client mit der höchsten Priorität wird ausgewählt."
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:40
 msgid "Priority will change automatically according to your status."
-msgstr "Die Priorität wird sich automatisch gemäß des Status ändern."
+msgstr ""
+"Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status."
 
 #: ../data/glade/account_modification_window.glade.h:35
 msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:42
 msgid "Resour_ce:"
 msgstr "Ressour_ce:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Die Ressource wird zum Jabber-Server geschickt, um die selbe JID in zwei oder mehr Teile zu trennen, abhängig von der Anzahl der Clients die mit dem selben Konto auf dem selben Server verbunden sind. Daher kann man gleichzeitig mit den Ressourcen \"Heim\" und \"Arbeit\" auf das selbe Konto verbinden. Die Ressource mit der höchsten Priorität wird die Nachrichten erhalten (siehe unten)."
+#: ../data/glade/accounts_window.glade.h:43
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Die Ressource wird zum Jabber-Server geschickt, um die selbe Jabber-ID in "
+"mehre Teile zu trennen, wenn verschiedene Jabber-Clients mit demselben Konto "
+"verbunden sind. Man kann also mit verschiedenen Ressourcen, z.B. \"Heim\" "
+"und \"Arbeit\", an verschiedenen Computern dasselbe Konto benutzen. Die "
+"Ressource mit der höchsten Priorität (siehe unten) erhält die Nachrichten."
 
 #: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
@@ -418,24 +451,23 @@
 msgstr "_Passphrase speichern (unsicher)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:44
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
-msgstr "Unter_haltungsverlauf für alle Kontakte dieses Kontos speichern"
+msgstr "Unterhaltungsver_lauf für alle Kontakte dieses Kontos speichern"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Keepalive-Pakete senden"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
-msgstr "Konto-Status mit globalem _Status abgleichen"
+msgstr "Konto-Status mit globalem Status synch_ronisieren"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:49
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Kontakte synchronisieren"
@@ -445,21 +477,16 @@
 msgstr "_SSL verwenden (veraltet)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:53
 msgid "Use file transfer proxies"
-msgstr "Datenübertragungs-Proxys verwenden"
+msgstr "Dateiübertragungs-Proxys verwenden"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "Mit Status _abgleichen"
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "_Jabber-ID:"
-
 #: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:14
 msgid "_Name:"
 msgstr "_Name:"
 
@@ -467,98 +494,139 @@
 msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+msgid "A_djust to status"
+msgstr "Mit Status _abgleichen"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../data/glade/accounts_window.glade.h:11
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "Falls aktiviert, wird Gajim nachfragen, bevor das Passwort über eine unsichere Verbindung versendet wird."
+#: ../data/glade/accounts_window.glade.h:12
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Falls aktiviert, fragt Gajim nach, bevor das Passwort über eine unsichere "
+"Verbindung gesendet wird."
 
 #: ../data/glade/accounts_window.glade.h:16
+msgid "Co_nnect on Gajim startup"
+msgstr "Beim _Programmstart verbinden"
+
+#: ../data/glade/accounts_window.glade.h:18
 #: ../data/glade/zeroconf_information_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Aktivieren"
-
 #: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Vorname:"
 
-#: ../data/glade/accounts_window.glade.h:24
+# TODO: GPG/PGP unification in original strings needed
+#: ../data/glade/accounts_window.glade.h:23
 msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Falls aktiviert, wird Gajim das Passwort von einem GnuPG-Agent wie seahorse beziehen"
+msgstr ""
+"Falls aktiviert, bezieht Gajim das Passwort von einem GPG-Agenten wie "
+"seahorse."
 
-#: ../data/glade/accounts_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:28
 #: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
 "You might consider to change possible firewall settings."
 msgstr ""
-"Falls der Standardport, der für eingehende Nachrichten benutzt wird, nicht für Ihre Konfiguration geeignet ist, können sie hier einen anderen Port festlegen.\n"
-"Möglicherweise ist es von Nöten, Ihre Firewall-Einstellungen zu ändern."
+"Falls der Standardport, der für eingehende Nachrichten benutzt wird, nicht "
+"für Ihre Konfiguration geeignet ist, können Sie hier einen anderen Port "
+"festlegen.\n"
+"Eventuell müssen Sie dazu Ihre Firewall-Einstellungen ändern."
 
-#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:31
 #: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13
-#: ../src/dialogs.py:678
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:680
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:32
 #: ../data/glade/zeroconf_information_window.glade.h:5
 #: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Nachname:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:33
 msgid "Mer_ge accounts"
 msgstr "Konten _zusammenführen"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44
-#: ../src/roster_window.py:5088
+#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5146
 msgid "Re_name"
 msgstr "_Umbenennen"
 
+#: ../data/glade/accounts_window.glade.h:46
+msgid "Send _keep-alive packets"
+msgstr "_Keepalive-Pakete senden"
+
+#: ../data/glade/accounts_window.glade.h:48
+msgid "Synchroni_ze account status with global status"
+msgstr "Konto-Status mit globalem Status synchroni_sieren"
+
+#: ../data/glade/accounts_window.glade.h:50
+msgid "Use G_PG Agent"
+msgstr "G_PG Schlüsselverwaltung verwenden"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use cust_om hostname/port"
+msgstr "Benutzerdefinierten Rechnernamen und P_ort verwenden"
+
 #: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
-msgstr "GPG _Agent verwenden"
+msgid "Use cust_om port:"
+msgstr "Benutzerdefinierten P_ort verwenden:"
 
 #: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Verwende benutzerdefinierten Port:"
+msgid "_Edit Personal Information..."
+msgstr "Persönliche Informationen b_earbeiten …"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/glade/accounts_window.glade.h:55
+msgid "_Enable"
+msgstr "Aktivi_eren"
+
+#: ../data/glade/accounts_window.glade.h:56
+msgid "_Hostname: "
+msgstr "Rec_hnername: "
+
+#: ../data/glade/accounts_window.glade.h:58
+msgid "_Manage..."
+msgstr "_Verwalten …"
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "_Port: "
+msgstr "_Port: "
+
+#: ../data/glade/accounts_window.glade.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Warnen, bevor eine unsichere Verbindung verwendet wird"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:62
+msgid "_use HTTP__PROXY environment variable"
+msgstr "Umgebungsvariable HTTP__PROXY ben_utzen"
+
+#: ../data/glade/accounts_window.glade.h:63
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/accounts_window.glade.h:64
 #: ../data/glade/features_window.glade.h:4
 msgid "gtk-close"
 msgstr "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:65
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "Umgebungsvariable HTTP_PROXY benutzen"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Konto:"
@@ -583,7 +651,7 @@
 "proceed."
 msgstr ""
 "Sie müssen sich bei diesem Transport\n"
-"registrieren, um einen Kontakt von diesem\n"
+"registrieren, um einen Kontakt über dieses\n"
 "Protokoll hinzufügen zu können. Klicken\n"
 "Sie auf Registrieren, um fortzufahren."
 
@@ -593,7 +661,7 @@
 "to add a contact from this protocol."
 msgstr ""
 "Sie müssen mit dem Transport verbunden sein, um einen\n"
-"Kontakt von diesem Protokoll hinzufügen zu können."
+"Kontakt über dieses Protokoll hinzufügen zu können."
 
 #: ../data/glade/add_new_contact_window.glade.h:11
 msgid "_Group:"
@@ -601,7 +669,7 @@
 
 #: ../data/glade/add_new_contact_window.glade.h:12
 msgid "_Nickname:"
-msgstr "_Spitzname:"
+msgstr "Spitz_name:"
 
 #: ../data/glade/add_new_contact_window.glade.h:13
 msgid "_Protocol:"
@@ -613,7 +681,7 @@
 
 #: ../data/glade/add_new_contact_window.glade.h:15
 msgid "_User ID:"
-msgstr "_Benutzer-ID:"
+msgstr "Ben_utzer-ID:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:1
 msgid "<b>An error has occurred:</b>"
@@ -633,19 +701,19 @@
 
 #: ../data/glade/adhoc_commands_window.glade.h:5
 msgid "Error description..."
-msgstr "Fehlerbeschreibung ..."
+msgstr "Fehlerbeschreibung …"
 
 #: ../data/glade/adhoc_commands_window.glade.h:6
 msgid "Please wait while retrieving command list..."
-msgstr "Bitte warten Sie, während die Befehlsliste empfangen wird ..."
+msgstr "Bitte warten Sie, während die Befehlsliste empfangen wird …"
 
 #: ../data/glade/adhoc_commands_window.glade.h:7
 msgid "Please wait while the command is sending..."
-msgstr "Bitte warten Sie, während der Befehl gesendet wird ..."
+msgstr "Bitte warten Sie, während der Befehl gesendet wird …"
 
 #: ../data/glade/adhoc_commands_window.glade.h:8
 msgid "Please wait..."
-msgstr "Bitte warten ..."
+msgstr "Bitte warten …"
 
 #: ../data/glade/adhoc_commands_window.glade.h:9
 msgid "This jabber entity does not expose any commands."
@@ -658,7 +726,9 @@
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>HINWEIS:</b> Sie sollten Gajim neu starten, damit alle Änderungen in Kraft treten"
+msgstr ""
+"<b>HINWEIS:</b> Sie sollten Gajim neu starten, damit alle Änderungen in "
+"Kraft treten."
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -674,23 +744,24 @@
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:2
 msgid "Deletes Message of the Day"
-msgstr "Löscht Nachricht des Tages (MOTD)"
+msgstr "Löscht die Nachricht des Tages (MOTD)."
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
 msgid "Edit _Privacy Lists..."
-msgstr "_Privatlisten bearbeiten ..."
+msgstr "_Privatsphären-Listen bearbeiten …"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
 msgid "Sends a message to users currently connected to this server"
-msgstr "Sendet eine Nachricht an momentan angemeldete Benutzer des Servers"
+msgstr ""
+"Sendet eine Nachricht an alle momentan angemeldeten Benutzer des Servers."
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:5
 msgid "Set MOTD..."
-msgstr "Nachricht des Tages (MOTD) setzen ..."
+msgstr "Nachricht des Tages (MOTD) setzen …"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
-msgstr "Setzt Nachricht des Tages (MOTD)"
+msgstr "Setzt die Nachricht des Tages (MOTD)."
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
@@ -698,11 +769,11 @@
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:8
 msgid "Update MOTD..."
-msgstr "Nachricht des Tages (MOTD) _aktualisieren ..."
+msgstr "Nachricht des Tages (MOTD) aktualisieren …"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
-msgstr "Aktualisiert Nachricht des Tages (MOTD)"
+msgstr "Aktualisiert die Nachricht des Tages (MOTD)."
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
@@ -710,7 +781,7 @@
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
 msgid "_Send Server Message..."
-msgstr "Servernachricht _senden ..."
+msgstr "Servernachricht _senden …"
 
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
@@ -742,8 +813,7 @@
 msgstr "Alle Status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102
-#: ../src/common/helpers.py:290
+#: ../src/common/commands.py:101 ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Abwesend"
 
@@ -760,7 +830,7 @@
 msgstr "habe "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -769,13 +839,13 @@
 msgstr "Einen Befehl ausführen"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
 #: ../data/glade/advanced_notifications_window.glade.h:15
 msgid "One or more special statuses..."
-msgstr "Einen oder mehr spezielle Status ..."
+msgstr "Einen oder mehrere spezielle Status …"
 
 #: ../data/glade/advanced_notifications_window.glade.h:16
 msgid "Online / Free For Chat"
@@ -810,12 +880,15 @@
 msgstr "Wenn "
 
 #: ../data/glade/advanced_notifications_window.glade.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Aktivere den UrgencyHint des Fenstermanagers, um das Chatfenster in der Taskleiste blinken zu lassen"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Aktivere den UrgencyHint des Fenstermanagers, um das Chatfenster in der "
+"Taskleiste blinken zu lassen"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Disable auto opening chat window"
-msgstr "_Deaktiviere automatisch öffnendes Chatfenster"
+msgstr "_Deaktiviere sich von selbst öffnende Chatfenster"
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable existing popup window"
@@ -827,7 +900,7 @@
 
 #: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable showing event in roster"
-msgstr "_Deaktivere die Ereignisanzeige in der Kontaktliste"
+msgstr "_Deaktiviere die Ereignisanzeige in der Kontaktliste"
 
 #: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in systray"
@@ -839,15 +912,15 @@
 
 #: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Open chat window with user"
-msgstr "Ein _Chat-Fenster mit Benutzer öffnen"
+msgstr "Ein _Chatfenster mit Benutzer öffnen"
 
 #: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Show event in roster"
-msgstr "Zeige Ereignis in der _Kontaktliste"
+msgstr "Zeige Ereignis in der Kontaktli_ste"
 
 #: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in systray"
-msgstr "Zeige _Ereignisse im Systray"
+msgstr "Zeige Ereignisse im _Systray"
 
 #: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
@@ -897,7 +970,7 @@
 
 #: ../data/glade/change_activity_dialog.glade.h:1
 msgid "<b>Message:</b> "
-msgstr "<b>Nachricht:</b>"
+msgstr "<b>Nachricht:</b> "
 
 #: ../data/glade/change_activity_dialog.glade.h:2
 msgid "Set Activity"
@@ -937,20 +1010,20 @@
 
 #: ../data/glade/change_status_message_dialog.glade.h:3
 msgid "Save as Preset..."
-msgstr "Speichere als Voreinstellung ..."
+msgstr "Als Voreinstellung speichern …"
 
 #: ../data/glade/chat_context_menu.glade.h:1
 msgid "Join _Group Chat"
-msgstr "_Gruppenchat beitreten"
+msgstr "_Chatraum betreten …"
 
 #: ../data/glade/chat_context_menu.glade.h:2
 #: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Add to Roster..."
-msgstr "Zur Kont_aktliste hinzufügen ..."
+msgstr "Zur Kont_aktliste hinzufügen …"
 
 #: ../data/glade/chat_context_menu.glade.h:3
 msgid "_Copy JID/Email Address"
-msgstr "JID/E-Mail-Adresse _kopieren"
+msgstr "Jabber-ID/E-Mail-Adresse _kopieren"
 
 #: ../data/glade/chat_context_menu.glade.h:4
 msgid "_Copy Link Location"
@@ -958,17 +1031,17 @@
 
 #: ../data/glade/chat_context_menu.glade.h:5
 msgid "_Open Email Composer"
-msgstr "E-Mail-Programm _öffnen"
+msgstr "E-Mail-Pr_ogramm öffnen"
 
 #: ../data/glade/chat_context_menu.glade.h:6
 msgid "_Open Link in Browser"
-msgstr "Link im Browser _öffnen"
+msgstr "Link im Br_owser öffnen"
 
 #: ../data/glade/chat_context_menu.glade.h:7
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
-msgstr "_Chat starten"
+msgstr "Chat _starten"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
 msgid "Invite _Contacts"
@@ -982,8 +1055,9 @@
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
 msgid "Toggle End to End Encryption"
-msgstr "ESessions-Verschlüsselung aktivieren"
+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"
@@ -997,9 +1071,9 @@
 #: ../data/glade/gc_control_popup_menu.glade.h:6
 #: ../data/glade/gc_occupants_menu.glade.h:7
 #: ../data/glade/roster_contact_context_menu.glade.h:17
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5784
+#: ../src/roster_window.py:5842
 msgid "_History"
 msgstr "_Verlauf"
 
@@ -1013,7 +1087,7 @@
 
 #: ../data/glade/chat_to_muc_window.glade.h:3
 msgid "MUC server"
-msgstr "MUC Server"
+msgstr "MUC-Server"
 
 #: ../data/glade/chat_to_muc_window.glade.h:4
 msgid "Please select a MUC server."
@@ -1024,8 +1098,8 @@
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 msgstr ""
-"Sie beginnen einen Multi-User Chat.\n"
-"Wählen Sie die Kontakte, die Sie einladen möchten"
+"Sie möchten einen Multi-User-Chat beginnen.\n"
+"Bitte wählen Sie die Kontakte, die Sie einladen möchten"
 
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
@@ -1033,7 +1107,7 @@
 
 #: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
-msgstr "Raum-Konfiguration"
+msgstr "Chatraum-Einstellungen"
 
 #: ../data/glade/edit_groups_dialog.glade.h:1
 msgid "Edit Groups"
@@ -1041,7 +1115,7 @@
 
 #: ../data/glade/esession_info_window.glade.h:1
 msgid "(<b>ESession</b> info)"
-msgstr "(<b>ESession</b>-Information)"
+msgstr "(<b>ESession</b>-Informationen)"
 
 #: ../data/glade/esession_info_window.glade.h:2
 msgid "_Verify"
@@ -1049,7 +1123,7 @@
 
 #: ../data/glade/features_window.glade.h:2
 msgid "<b>List of possible features in Gajim:</b>"
-msgstr "<b>Liste möglicher Gajim-Features:</b>"
+msgstr "<b>Liste der verwendbaren Features:</b>"
 
 #: ../data/glade/features_window.glade.h:3
 msgid "Features"
@@ -1065,11 +1139,13 @@
 
 #: ../data/glade/filetransfers.glade.h:3
 msgid "Cancels the selected file transfer"
-msgstr "Bricht die ausgewählte Dateiübertragung ab"
+msgstr "Bricht die ausgewählte Dateiübertragung ab."
 
 #: ../data/glade/filetransfers.glade.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Bricht die ausgewählte Dateiübertragung ab und löscht unvollständige Daten"
+msgstr ""
+"Bricht die ausgewählte Dateiübertragung ab und löscht die unvollständige "
+"Datei."
 
 #: ../data/glade/filetransfers.glade.h:5
 msgid "Clean _up"
@@ -1081,41 +1157,46 @@
 
 #: ../data/glade/filetransfers.glade.h:7
 msgid "Hides the window"
-msgstr "Versteckt das Fenster"
+msgstr "Versteckt das Fenster."
 
 #: ../data/glade/filetransfers.glade.h:8
 msgid "Remove file transfer from the list."
-msgstr "Entferne Dateiübertragung von der Liste."
+msgstr "Entferne Dateiübertragung aus der Liste"
 
 #: ../data/glade/filetransfers.glade.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Entfernt beendete, abgebrochene und fehlgeschlagene Dateiübertragungen von der Liste"
+msgstr ""
+"Entfernt beendete, abgebrochene und fehlgeschlagene Dateiübertragungen aus "
+"der Liste."
 
 #: ../data/glade/filetransfers.glade.h:10
 msgid "Shows a list of file transfers between you and others"
-msgstr "Zeigt eine Liste von Dateiübertragungen an"
+msgstr "Zeigt eine Liste von Dateiübertragungen an."
 
 #: ../data/glade/filetransfers.glade.h:11
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Diese Aktion entfernt eine Dateiübertragung von der Liste. Falls die Übertragung aktiv ist, wird sie erst gestoppt, dann entfernt"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Diese Aktion entfernt eine Dateiübertragung aus der Liste. Falls die "
+"Übertragung aktiv ist, wird sie erst gestoppt und anschließend entfernt."
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
-msgstr "Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
+msgstr ""
+"Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
 #: ../data/glade/filetransfers.glade.h:14
 msgid "_Notify me when a file transfer is complete"
-msgstr "_Benachrichtige mich, wenn die Dateiübertragung abgeschlossen ist"
+msgstr "Be_nachrichtige mich, wenn die Dateiübertragung abgeschlossen ist"
 
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
 msgid "_Open Containing Folder"
-msgstr "_Öffne Ordner"
+msgstr "Öffne _Ordner"
 
 #: ../data/glade/filetransfers.glade.h:16
 msgid "_Pause"
@@ -1127,7 +1208,7 @@
 
 #: ../data/glade/gajim_themes_window.glade.h:1
 msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Chatstatus Tabellenfarbe</b>"
+msgstr "<b>Tabellenfarben des Chat-Status</b>"
 
 #: ../data/glade/gajim_themes_window.glade.h:2
 msgid ""
@@ -1141,8 +1222,7 @@
 "Kontakt-Reihe\n"
 "Chat-Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
-#: ../src/chat_control.py:743
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:749
 msgid "Bold"
 msgstr "Fett"
 
@@ -1156,19 +1236,17 @@
 
 #: ../data/glade/gajim_themes_window.glade.h:9
 msgid "Gajim Themes Customization"
-msgstr "Gajim Thema Einstellungen"
+msgstr "Gajim-Design-Einstellungen"
 
 #: ../data/glade/gajim_themes_window.glade.h:10
 msgid "Gone"
 msgstr "Weg"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
-#: ../src/common/pep.py:152
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
-#: ../src/chat_control.py:744
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:750
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1185,7 +1263,7 @@
 "MUC Directed\n"
 "Messages"
 msgstr ""
-"MUC gerichtete\n"
+"an MUC gerichtete\n"
 "Nachrichten"
 
 #: ../data/glade/gajim_themes_window.glade.h:17
@@ -1198,7 +1276,7 @@
 
 #: ../data/glade/gajim_themes_window.glade.h:19
 msgid "Text _font:"
-msgstr "Schrift_art:"
+msgstr "Schri_ftart:"
 
 #: ../data/glade/gajim_themes_window.glade.h:20
 msgid "_Background:"
@@ -1206,27 +1284,27 @@
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
 msgid "Change _Nickname..."
-msgstr "_Spitzname ändern ..."
+msgstr "Spitz_name ändern …"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
 msgid "Change _Subject..."
-msgstr "_Thema ändern ..."
+msgstr "_Design ändern …"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
 msgid "Configure _Room..."
-msgstr "_Raum einrichten ..."
+msgstr "Chat_raum einrichten …"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
 msgid "_Bookmark"
-msgstr "Raum zu _Lesezeichen hinzufügen"
+msgstr "Chatraum zu den Lesezeichen _hinzufügen"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
 msgid "_Destroy Room"
-msgstr "_Raum auflösen"
+msgstr "_Chatraum auflösen"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:7
 msgid "_Manage Room"
-msgstr "Raum _verwalten"
+msgstr "Chatraum _verwalten"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:8
 msgid "_Minimize on close"
@@ -1246,7 +1324,7 @@
 
 #: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
-msgstr "_Verbannen"
+msgstr "Ver_bannen"
 
 #: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
@@ -1272,29 +1350,30 @@
 msgid "Create new post"
 msgstr "Neue Nachricht"
 
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:315
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:240
 msgid "From"
 msgstr "Von"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:170
+#: ../src/history_manager.py:201
 msgid "Subject"
-msgstr "Betreff"
+msgstr "Thema"
 
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<b>WARNUNG:</b>\n"
-"Wenn Sie viel löschen, stellen Sie sicher, dass Gajim nicht läuft. Vermeiden Sie generell Löschungen von Unterhaltungen mit Kontakten, mit denen Sie gerade chatten."
+"Wenn Sie viel löschen möchten, beenden Sie Gajim vorher. Vermeiden Sie "
+"generell Löschungen von Unterhaltungen mit Kontakten, mit denen Sie gerade "
+"chatten."
 
 #: ../data/glade/history_manager.glade.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-msgstr "<big><b>Willkommen zum Gajim Verlaufsmanager</b></big>"
+msgstr "<big><b>Willkommen im Gajim-Verlaufsmanager</b></big>"
 
 #: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
@@ -1306,24 +1385,28 @@
 
 #: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
-msgstr "Gajim Verlaufsmanager"
+msgstr "Gajim-Verlaufsmanager"
 
 #: ../data/glade/history_manager.glade.h:7
 msgid ""
-"This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead.\n"
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
 "\n"
-"Use this program to delete or export logs. You can select logs from the left and/or search database from below."
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
 msgstr ""
-"Dieser Log-Manager ist nicht zum Ansehen der Logeinträge gedacht. Wenn Sie nach einer solchen Funktion suchen, benutzen Sie sattdessen das Verlaufsfenster.\n"
+"Dieser Log-Manager ist nicht zum Ansehen der Logeinträge gedacht. Wenn Sie "
+"nach einer solchen Funktion suchen, benutzen Sie sattdessen das "
+"Verlaufsfenster.\n"
 "\n"
-"Benutzen Sie dieses Programm, um Logs zu löschen oder zu exportieren. Sie können Logeinträge links auswählen und/oder unten die Datenbank durchsuchen."
+"Benutzen Sie dieses Programm, um Logs zu löschen oder zu exportieren. Sie "
+"können links Logeinträge auswählen und unten die Datenbank durchsuchen."
 
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
-msgstr "_Suche Datenbank"
+msgstr "Durch_suche Datenbank"
 
-#: ../data/glade/history_window.glade.h:1
-#: ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Unterhaltungsverlauf"
 
@@ -1333,27 +1416,26 @@
 "Groupchat Histories\n"
 "All Chat Histories"
 msgstr ""
-"JID oder Kontaktname eingeben\n"
+"Jabber-ID oder Kontaktname eingeben\n"
 "Gruppenchat-Verlauf\n"
 "Gesamter Chatverlauf"
 
 #: ../data/glade/history_window.glade.h:5
 msgid "Search:"
-msgstr "Suche:"
+msgstr "Suchen:"
 
 #: ../data/glade/history_window.glade.h:6
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
-msgstr "Unterhaltungs-Ver_lauf"
+msgstr "Unterhaltungsver_lauf"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1697
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1702
 msgid "Join Group Chat"
-msgstr "Betrete Gruppenchat"
+msgstr "Chatraum betreten"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
 msgid "Join this room automatically when I connect"
-msgstr "Betrete diesen Raum automatisch, wenn ich mich verbinde"
+msgstr "Betritt diesen Chatraum automatisch, wenn ich mich verbinde"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
@@ -1372,17 +1454,16 @@
 #: ../data/glade/join_groupchat_window.glade.h:6
 #: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
-msgstr "Raum:"
+msgstr "Chatraum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
-#: ../src/disco.py:1198
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1199
+#: ../src/disco.py:1619
 msgid "_Join"
 msgstr "_Betreten"
 
 #: ../data/glade/manage_accounts_window.glade.h:1
 msgid "Manage Accounts"
-msgstr "Konten Verwalten"
+msgstr "Konten verwalten"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:1
 msgid "Auto join"
@@ -1390,15 +1471,15 @@
 
 #: ../data/glade/manage_bookmarks_window.glade.h:2
 msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Falls aktiviert, tritt Gajim dem Gruppenchat beim Programmstart bei"
+msgstr "Falls aktiviert, tritt Gajim diesem Chatraum beim Programmstart bei."
 
 #: ../data/glade/manage_bookmarks_window.glade.h:3
 msgid "Manage Bookmarks"
-msgstr "Verwalte Lesezeichen"
+msgstr "Chatraum-Lesezeichen"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:4
 msgid "Minimize on Auto Join"
-msgstr "Minimieren bei Auto-Join"
+msgstr "Minimieren bei automatischem Beitritt"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
@@ -1414,7 +1495,7 @@
 
 #: ../data/glade/manage_pep_services_window.glade.h:1
 msgid "PEP Service Configuration"
-msgstr "PEP-Dienst Konfiguration"
+msgstr "Konfiguration des PEP-Dienstes"
 
 #: ../data/glade/manage_pep_services_window.glade.h:2
 msgid "_Configure"
@@ -1434,7 +1515,7 @@
 
 #: ../data/glade/manage_proxies_window.glade.h:3
 msgid "B_OSH Port:"
-msgstr "B_OSH Port:"
+msgstr "B_OSH-Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:4
 msgid ""
@@ -1448,55 +1529,56 @@
 
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Manage Proxy Profiles"
-msgstr "Proxy Verwaltung"
+msgstr "Proxy-Verwaltung"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Name:"
-msgstr "Name:"
-
-#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Pass_word:"
 msgstr "Pass_wort:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Proxy _Host:"
-msgstr "Proxy _Server:"
+msgstr "Proxy-A_dresse:"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Proxy _Port:"
-msgstr "Proxy _Port:"
+msgstr "Proxy-_Port:"
 
+#: ../data/glade/manage_proxies_window.glade.h:11
+msgid "Use HTTP prox_y"
+msgstr "HTTP-Prox_y verwenden"
+
 #: ../data/glade/manage_proxies_window.glade.h:12
-msgid "Type:"
-msgstr "Art:"
+msgid "Use proxy auth_entication"
+msgstr "Authentifizierung _verwenden"
 
 #: ../data/glade/manage_proxies_window.glade.h:13
-msgid "Use HTTP proxy"
-msgstr "HTTP-Proxy benutzen"
+msgid "_BOSH URL:"
+msgstr "_BOSH-Adresse:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
-msgid "Use proxy authentication"
-msgstr "Verwende Authentifizierungsproxy"
-
 #: ../data/glade/manage_proxies_window.glade.h:15
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "_Type:"
+msgstr "_Art:"
 
+#: ../data/glade/manage_proxies_window.glade.h:16
+msgid "_Username:"
+msgstr "_Benutzername:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
 msgstr "Kontakt zur Kontaktliste hinzufügen (Strg+D)"
 
+# TODO: Synchronize with other strings concerning bookmarks
 #: ../data/glade/message_window.glade.h:2
 msgid "Bookmark this room (Ctrl+B)"
-msgstr "Diesen Raum den Lesenzeichen hinzufügen (Strg+B)"
+msgstr "Diesen Chatraum speichern (Strg+B)"
 
 #: ../data/glade/message_window.glade.h:3
 msgid "Browse the chat history (Ctrl+H)"
-msgstr "Chatverlauf durchsuchen (Strg+H)"
+msgstr "Chatverlauf anzeigen (Strg+H)"
 
 #: ../data/glade/message_window.glade.h:4
 msgid "Change the room's subject (Alt+T)"
-msgstr "Raumbetreff ändern (Alt+T)"
+msgstr "Thema des Chatraums ändern (Alt+T)"
 
 #: ../data/glade/message_window.glade.h:5
 msgid "Change your nickname (Ctrl+N)"
@@ -1504,7 +1586,7 @@
 
 #: ../data/glade/message_window.glade.h:6
 msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Kontakt zur Unterhaltung einladen (Strg+G)"
+msgstr "Weiteren Kontakt zur Unterhaltung einladen (Strg+G)"
 
 #: ../data/glade/message_window.glade.h:7
 msgid "Send a file (Ctrl+F)"
@@ -1512,11 +1594,11 @@
 
 #: ../data/glade/message_window.glade.h:8
 msgid "Show a list of emoticons (Alt+M)"
-msgstr "Smilie-Liste anzeigen (Alt+M)"
+msgstr "Emoticons (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
 msgid "Show a list of formattings"
-msgstr "Eine Formatierungsliste anzeigen"
+msgstr "Schriftformatierung (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
@@ -1539,7 +1621,7 @@
 
 #: ../data/glade/preferences_window.glade.h:1
 msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Erweiterter Konfigurations-Editor</b>"
+msgstr "<b>Erweiterter Konfigurationseditor</b>"
 
 #: ../data/glade/preferences_window.glade.h:2
 msgid "<b>Applications</b>"
@@ -1555,7 +1637,7 @@
 
 #: ../data/glade/preferences_window.glade.h:5
 msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Chatlinien Farbe</b>"
+msgstr "<b>Chatlinien-Farben</b>"
 
 #: ../data/glade/preferences_window.glade.h:6
 msgid "<b>Chat state notifications</b>"
@@ -1572,7 +1654,7 @@
 
 #: ../data/glade/preferences_window.glade.h:10
 msgid "<b>GMail Options</b>"
-msgstr "<b>Google Mail-Optionen</b>"
+msgstr "<b>Google-Mail-Optionen</b>"
 
 #: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Preset Status Messages</b>"
@@ -1604,7 +1686,7 @@
 
 #: ../data/glade/preferences_window.glade.h:20
 msgid "Advanced..."
-msgstr "Erweitert ..."
+msgstr "Erweitert …"
 
 #: ../data/glade/preferences_window.glade.h:21
 msgid ""
@@ -1618,17 +1700,23 @@
 
 #: ../data/glade/preferences_window.glade.h:24
 msgid "Allow _OS information to be sent"
-msgstr "Erlaube Senden von _Betriebssystem-Information"
+msgstr "Erlaube das Senden von Betriebssystem-Inf_ormation"
 
 #: ../data/glade/preferences_window.glade.h:25
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Popups/Benachrichtigungen _zulassen, wenn ich abwesend/nicht verfügbar/beschäftigt/unsichtbar bin"
+msgstr ""
+"Popups/Benachrichtigungen zulassen, wenn ich _abwesend/nicht verfügbar/"
+"beschäftigt/unsichtbar bin"
 
 #: ../data/glade/preferences_window.glade.h:26
-msgid "Ask status message when I:"
-msgstr "Erfrage Statusnachricht beim: "
+msgid "Allow sound when I'm _busy"
+msgstr "Soundausgabe erlauben, wenn ich _beschäftigt bin"
 
 #: ../data/glade/preferences_window.glade.h:27
+msgid "Ask status message when I:"
+msgstr "Erfrage Statusnachricht beim:"
+
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1637,24 +1725,24 @@
 "Custom"
 msgstr ""
 "Bei jedem Programmstart automatisch erkennen\n"
-"Immer GNOME Standard-Anwendungen verwenden\n"
-"Immer KDE Standard-Anwendungen verwenden\n"
-"Immer XFCE4 Standard-Anwendungen verwenden\n"
+"Immer die GNOME-Standard-Anwendungen verwenden\n"
+"Immer die KDE-Standard-Anwendungen verwenden\n"
+"Immer die XFCE4-Standard-Anwendungen verwenden\n"
 "Benutzerdefiniert"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Chat-Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Beim Starten überprüfen, ob Gajim der _Standard-Jabber-Client ist"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
-msgstr "Farbe und Schriftart für die Oberfläche konfigurieren"
+msgstr "Farben und Schriftarten für die Oberfläche konfigurieren"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1662,304 +1750,428 @@
 "Detached roster with chat grouped by account\n"
 "Detached roster with chat grouped by type"
 msgstr ""
-"seperate Kontaktliste mit getrennter Unterhaltung\n"
-"seperate Kontaktliste mit Einzelunterhaltung\n"
+"separate Kontaktliste mit getrennter Unterhaltung\n"
+"separate Kontaktliste mit Einzelunterhaltung\n"
 "Einzelfenster\n"
-"seperate Kontaktliste gruppiert nach Benutzerkonto\n"
-"seperate Kontaktliste gruppiert nach Typ"
+"separate Kontaktliste gruppiert nach Benutzerkonto\n"
+"separate Kontaktliste gruppiert nach Typ"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
-msgstr "Zeige Aktivität von Kontakten in der Kontaktliste"
+msgstr "_Aktivitäten von Kontakten in der Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
-msgstr "Zeige zusätzliche _E-Mail-Details"
+msgstr "Zusätzliche _E-Mail-Details anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
-msgstr "Zeige Musiktitel von Kontakten in der Kontaktliste"
+msgstr "Die gerade abgespielten Musik_titel anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
-msgstr "Zeige A_vatare von Kontakten in der Kontaktliste"
+msgstr "A_vatare der Kontakte in der Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
-msgstr "Zeige Stimmung von Kontakten in der Kontaktliste"
+msgstr "_Stimmungen anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
-msgstr "Zeige die Status_nachrichten von Kontakten in der Kontaktliste"
+msgstr "Status_nachrichten anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows."
-msgstr "Gajim kann Informationen, die eine Unterhaltung mit einem Kontakt betreffen, empfangen und versenden. Hier können Sie definieren, welche Chatstatus-Benachrichtigungen Sie in Ihrem Chatfenster anzeigen möchten."
-
 #: ../data/glade/preferences_window.glade.h:47
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party."
-msgstr "Gajim kann Informationen, die eine Unterhaltung mit einem Kontakt betreffen, empfangen und versenden. Hier können Sie definieren, welche Chatstatus-Benachrichtigungen Sie Ihrem Gegenüber senden möchten."
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim kann Zusatzinformationen zu einer Unterhaltung empfangen und "
+"versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
+"in Ihrem Chatfenster anzeigt werden sollen."
 
 #: ../data/glade/preferences_window.glade.h:48
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Bildschirmecke über Kontakte informieren, die sich gerade abgemeldet haben"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim kann Zusatzinformationen zu einer Unterhaltung empfangen und "
+"versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
+"Sie Ihrem Gegenüber senden möchten."
 
-#: ../data/glade/preferences_window.glade.h:50
-msgid "Hide all buttons in chat windows"
-msgstr "Versteckt alle Knöpfe im Chat-Fenster"
+#: ../data/glade/preferences_window.glade.h:49
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim informiert Sie über ein Popup-Fenster in der rechten unteren "
+"Bildschirmecke über Kontakte, die sich gerade abgemeldet haben."
 
 #: ../data/glade/preferences_window.glade.h:51
-msgid "If checked, Gajim will allow others to detect the operation system you are using"
-msgstr "Falls aktiviert, erlaubt Gajim anderen Ihr Betriebssystem festzustellen"
+msgid "Hide all buttons in chat windows"
+msgstr "Versteckt alle Schaltflächen im Chatfenster"
 
 #: ../data/glade/preferences_window.glade.h:52
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Falls aktiviert, wird Gajim auch Informationen über den Absender von neuen E-Mails hinzufügen."
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, Ihr Betriebssystem "
+"festzustellen."
 
 #: ../data/glade/preferences_window.glade.h:53
-msgid "If checked, Gajim will change status to Away when the computer is unused."
-msgstr "Falls aktiviert, wird Gajim den Status in Abwesend ändern, wenn der Computer nicht genutzt wird."
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Falls aktiviert, fügt Gajim auch Informationen über den Absender neuer E-"
+"Mails hinzu."
 
 #: ../data/glade/preferences_window.glade.h:54
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
-msgstr "Falls aktiviert, wird Gajim den Status in Nicht Verfügbar ändern, wenn der Computer länger nicht genutzt wird."
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Falls aktiviert, wird der Status in Abwesend geändert, wenn der Computer "
+"nicht genutzt wird."
 
 #: ../data/glade/preferences_window.glade.h:55
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Falls aktiviert, wird Gajim einen Avatar im Kontaktlistenfenster und in Gruppenchats einblenden"
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+"Falls aktiviert, wird der Status in Nicht Verfügbar geändert, wenn der "
+"Computer längere Zeit nicht genutzt wird."
 
 #: ../data/glade/preferences_window.glade.h:56
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Falls aktiviert, wird Gajim für jeden Kontakt unter dem Kontaktnamen in der Kontaktliste und im Gruppenchat-Fenster die Statusnachricht anzeigen"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Falls aktiviert, werden die Avatare der Kontakte in der Kontaktliste und in "
+"Chaträumen eingeblendet."
 
 #: ../data/glade/preferences_window.glade.h:57
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "Falls aktiviert, wird Gajim die Aktivität der Kontakte im Kontaktlistenfenster anzeigen"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Falls aktiviert, wird unter dem Namen jeden Kontaktes in der Kontaktliste "
+"und in Chaträumen die Statusnachricht angezeigt."
 
 #: ../data/glade/preferences_window.glade.h:58
-msgid "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "Falls aktiviert, wird Gajim die Stimmung der Kontakte im Kontaktlistenfenster anzeigen"
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Falls aktiviert, wird die Aktivität der Kontakte in der Kontaktliste "
+"angezeigt."
 
 #: ../data/glade/preferences_window.glade.h:59
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "Falls aktiviert, wird Gajim den Musiktitel der Kontakte im Kontaktlistenfenster anzeigen"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Falls aktiviert, wird die Stimmung der Kontakte in der Kontaktliste "
+"angezeigt."
 
 #: ../data/glade/preferences_window.glade.h:60
-msgid "If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat."
-msgstr "Falls aktiviert, wird Gajim Rechtschreibfehler im Chat-Eingabefenster hervorheben. Wenn keine Sprache im Eingabefeld definiert wurde (per Rechtsklick), wird die Standardsprache für diesen Kontakt oder Gruppenchat verwendet"
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Falls aktiviert, wird der gerade abgespielte Musiktitel der Kontakte in der "
+"Kontaktliste angezeigt."
 
 #: ../data/glade/preferences_window.glade.h:61
-msgid "If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Falls aktiviert, wird Gajim eingehende Ereignisse von unauthorisierten Kontakten ignorieren. Vorsicht bei der Benutzung, denn alle Nachrichten von Kontakten werden blockiert, die nicht in Ihrer Kontaktliste sind"
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+"Falls aktiviert, werden Rechtschreibfehler im Chat-Eingabefenster farblich "
+"hervorgehoben. Wenn keine Sprache im Eingabefeld festgelegt wurde (per "
+"Rechtsklick), wird die Standardsprache für diesen Kontakt oder Chatraum "
+"verwendet."
 
 #: ../data/glade/preferences_window.glade.h:62
-msgid "If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged."
-msgstr "Falls aktiviert, wird Gajim Logs von verschlüsselten Nachrichten aufzeichnen. Bitte bedenken Sie, dass bei der Benutzung von ESession-Verschlüsselung der Chatpartner zustimmen muss; ansonsten wird nicht mitgeschnitten."
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Falls aktiviert, werden eingehende Ereignisse von nicht autorisierten "
+"Kontakten ignoriert. Vorsicht: Sie können nur noch Nachrichten von Kontakten "
+"empfangen, die in Ihrer Kontaktliste sind."
 
 #: ../data/glade/preferences_window.glade.h:63
-msgid "If checked, Gajim will show a notification when a new e-mail is received via GMail"
-msgstr "Falls aktiviert, wird Gajim eine Benachrichtigung anzeigen, wenn eine neue E-Mail über Google Mail empfangen wurden"
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+"Falls aktiviert, werden Logs von verschlüsselten Nachrichten aufgezeichnet. "
+"Bitte bedenken Sie, dass bei der Benutzung von ESession-Verschlüsselung der "
+"Chatpartner zustimmen muss; ansonsten wird nichts aufgezeichnet."
 
 #: ../data/glade/preferences_window.glade.h:64
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "Falls aktiviert, wird Gajim Protokoll-spezifische Symbole verwenden. (Ein Kontakt aus MSN wird z.B. das äquivalente MSN-Symbol für den Status \"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc. haben)"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"Falls aktiviert, wird eine Benachrichtigung angezeigt, wenn eine neue E-Mail "
+"über Google-Mail empfangen wurde."
 
 #: ../data/glade/preferences_window.glade.h:65
-msgid "If enabled, Gajim will not ask for a status message. The specified default message will be used instead."
-msgstr "Falls aktiviert, wird Gajim nicht nach einer Statusnachricht fragen. Die Standardnachricht wird anstelle benutzt"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Falls aktiviert, werden protokollspezifische Symbole verwendet. (Zum "
+"Beispiel wird für einen MSN-Kontakt das jeweilige MSN-Symbol für den Status "
+"\"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc. angezeigt.)"
 
 #: ../data/glade/preferences_window.glade.h:66
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Falls nicht deaktivert, wird Gajim ASCII-Smilies wie \":)\" mit äquivalenten graphischen Emoticons ersetzen"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"Falls aktiviert, werden Sie nicht nach einer Statusnachricht gefragt. Die "
+"Standardnachricht wird benutzt."
 
 #: ../data/glade/preferences_window.glade.h:67
-msgid "Log _encrypted chat session"
-msgstr "_Verschlüsselte Sitzungen mitschneiden"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Falls aktiviert, werden ASCII-Smilies wie \":)\" mit äquivalenten "
+"graphischen Emoticons ersetzt."
 
 #: ../data/glade/preferences_window.glade.h:68
+msgid "Log _encrypted chat session"
+msgstr "V_erschlüsselte Sitzungen aufzeichnen"
+
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "Nachrichtenfenster _kompakt anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
-msgstr "_Verwalten ..."
+msgstr "Verwalte_n …"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+"Niemals\n"
+"Nur bei neuen Ereignissen\n"
+"Immer"
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
-msgstr "Über Kontakte benachrichtigen, die sich einloggen"
+msgstr "Benachr_ichtigen, wenn sich ein Kontakt anmeldet"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
-msgstr "Über Kontakte benachrichtigen, die sich abmelden"
+msgstr "Benachrichtigen, wenn sich ein K_ontakt abmeldet"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
-msgstr "Über neue _Google Mail E-Mails benachrichtigen"
+msgstr "Bei neuen E-Mails bei _Google-Mail benachrichtigen"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Persönliche Ereignisse"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
-msgstr "_Klänge abspielen"
+msgstr "Klänge ab_spielen"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
-"Popup öffnen\n"
-"Benachrichtige mich darüber\n"
+"Chatfenster öffnen\n"
+"Benachrichtigung anzeigen\n"
 "Nur in der Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../data/glade/preferences_window.glade.h:80
+# FIXME: Check English. This should be called something like "Show systray icon"
+# because the systray itself is always visible.
+#: ../data/glade/preferences_window.glade.h:84
+msgid "Show systray:"
+msgstr "Symbol in der Systemleiste anzeigen:"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "_anmelden"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "a_bmelden"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Einige Nachrichten könnten formatierten Inhalt enthalten (Farben, Schriftarten etc.). Falls aktiviert, wird Gajim nur den reinen Nachrichtentext anzeigen."
+#: ../data/glade/preferences_window.glade.h:87
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Einige Nachrichten können formatierten Inhalt enthalten (Farben, "
+"Schriftarten usw.). Falls aktiviert, wird Gajim nur den reinen "
+"Nachrichtentext anzeigen."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Kontakte nach Status sortieren"
 
-#: ../data/glade/preferences_window.glade.h:84
-#: ../src/config.py:397
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:387
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "Status-S_ymbole:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
-msgstr "T_hema:"
+msgstr "D_esign:"
 
-#: ../data/glade/preferences_window.glade.h:88
-msgid "The auto away status message. If empty, Gajim will not change the current status message"
-msgstr "Die automatische Abwesenheits-Statusnachricht. Wenn leer, wird Gajim die aktuelle Statusnachricht belassen"
+#: ../data/glade/preferences_window.glade.h:93
+msgid ""
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
+msgstr ""
+"Dieser Text wird als Statusnachricht zum Status Abwesend gesetzt, wenn der "
+"Computer für die angegebene Zeit nicht benutzt wurde. Wenn leer, wird die "
+"aktuelle Statusnachricht belassen. $S kann für die vorherige Statusnachricht "
+"eingesetzt werden. $T kann für die Zeit eingesetzt werden, seit der der "
+"Status auf Abwesend gestellt ist."
 
-#: ../data/glade/preferences_window.glade.h:89
-msgid "The auto not available status message. If empty, Gajim will not change the current status message"
-msgstr "Die automatische Nicht-Verfügbar-Statusnachricht. Wenn leer, wird Gajim die aktuelle Statusnachricht belassen"
+#: ../data/glade/preferences_window.glade.h:96
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
+msgstr ""
+"Dieser Text wird als Statusnachricht zum Status Nicht Verfügbar gesetzt, "
+"wenn der Computer für die angegebene Zeit nicht benutzt wurde. Wenn leer, "
+"wird die aktuelle Statusnachricht belassen. $S kann für die vorherige "
+"Statusnachricht eingesetzt werden. $T kann für die Zeit eingesetzt werden, "
+"seit der der Status auf Nicht Verfügbar gestellt ist."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "_Transport-Symbole verwenden"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Benutze System-_Voreinstellung"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
-msgstr "Wenn neue Nachricht empfangen wird"
+msgstr "Wenn eine neue Nachricht empfangen wird:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "Automatisch _abwesend nach:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
-msgstr "Zeige Benachrichtigung über Chatstatus:"
+msgstr "Benachrichtigungen über _den Chatstatus anzeigen:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Dateimanager:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
-msgstr "Ereignisse von Kontakten, die nicht in der Liste sind, _ignorieren"
+msgstr ""
+"Ereignisse von Kontakten, die nicht in der Kontaktliste sind, _ignorieren"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "Formatierten Inhalt in ankommenden Nachrichten _ignorieren"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Eingehende Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Logge die Statusveränderungen von Kontakten"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
-msgstr "_Mail-Programm:"
+msgstr "E-_Mail-Programm:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "Automatisch _nicht verfügbar nach:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
-msgstr "Ö_ffnen ..."
+msgstr "Ö_ffnen …"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Ausgehende Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "Auf Standardfarben zu_rücksetzen"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
-msgstr "_Sende Benachrichtigung über Chatstatus:"
+msgstr "Benachrichtigungen über den Chatstatus _senden:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Statusnachricht:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "_URL hervorheben:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
-msgstr "Fensterverhalten"
+msgstr "_Fensterverhalten:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
-msgstr "in _Gruppenchats"
+msgstr "in Chat_räumen"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "in der _Kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "Minuten"
 
@@ -1989,37 +2201,37 @@
 
 #: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
-msgstr "Alle"
+msgstr "allen"
 
 #: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
-msgstr "Erlauben"
+msgstr "Erlaube"
 
 #: ../data/glade/privacy_list_window.glade.h:8
 msgid "Deny"
-msgstr "Ablehnen"
+msgstr "Verbiete"
 
 #: ../data/glade/privacy_list_window.glade.h:9
 msgid "JabberID"
-msgstr "Jabber-ID:"
+msgstr "der Jabber-ID:"
 
 #: ../data/glade/privacy_list_window.glade.h:10
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:2572
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2576
 msgid "Privacy List"
-msgstr "Privatliste"
+msgstr "Privatsphären-Liste"
 
 #: ../data/glade/privacy_list_window.glade.h:12
 msgid "all by subscription"
-msgstr "alle nach Anmeldung"
+msgstr "Kontakten, die:"
 
 #: ../data/glade/privacy_list_window.glade.h:13
 msgid "all in the group"
-msgstr "Alle in der Gruppe"
+msgstr "allen in der Gruppe"
 
+# TODO: Review original string
 #: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
 "none\n"
@@ -2027,26 +2239,26 @@
 "from\n"
 "to"
 msgstr ""
-"keine\n"
-"beide\n"
-"von\n"
-"an"
+"nicht in Ihrer Liste stehen und in deren Liste Sie nicht stehen\n"
+"in Ihrer Liste stehen und in deren Liste Sie stehen\n"
+"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
 msgid "to send me messages"
-msgstr "um mir Nachrichten zu senden"
+msgstr "mir Nachrichten zu senden"
 
 #: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
-msgstr "um mir Anfragen zu schicken"
+msgstr "mir Anfragen zu schicken"
 
 #: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me status"
-msgstr "um mir den Status zu senden"
+msgstr "mir seinen/ihren Status zu senden"
 
 #: ../data/glade/privacy_list_window.glade.h:21
 msgid "to view my status"
-msgstr "um meinen Status zu sehen"
+msgstr "meinen Status zu sehen"
 
 #: ../data/glade/profile_window.glade.h:1
 #: ../data/glade/vcard_information_window.glade.h:1
@@ -2073,129 +2285,128 @@
 msgstr "<b>Firma:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Abteilung:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>E-Mail:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Zusatzadresse:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Nachname:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Vollständiger Name</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Vorname:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Homepage:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Zweiter Vorname:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Name:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Spitzname:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Telefonnummer:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Position:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Postleitzahl:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
-msgstr "<b>Namensvorsatz:</b>"
+msgstr "<b>Namenspräfix:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29
-#: ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:328
 msgid "<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Bundesland:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Straße:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Namenszusatz:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Über"
 
 #: ../data/glade/profile_window.glade.h:32
 msgid "Click to set your avatar"
-msgstr "Hier klicken, um Ihren Avatar zu setzen"
+msgstr "Hier klicken, um den Avatar zu auszuwählen."
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: JJJJ-MM-TT"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Persönliche Details"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Arbeit"
 
@@ -2205,73 +2416,70 @@
 
 #: ../data/glade/remove_account_window.glade.h:2
 msgid "Remove account _only from Gajim"
-msgstr "Konto entfernen (_nur in Gajim)"
+msgstr "Kont_o entfernen (nur in Gajim)"
 
 #: ../data/glade/remove_account_window.glade.h:3
 msgid "Remove account from Gajim and from _server"
-msgstr "Konto _entfernen (in Gajim und auf dem Server)"
+msgstr "Konto entfernen (in Gajim und auf dem _Server)"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../src/roster_window.py:5125
-#: ../src/roster_window.py:5603
-#: ../src/roster_window.py:5732
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5183
+#: ../src/roster_window.py:5661 ../src/roster_window.py:5790
 msgid "_Remove"
 msgstr "_Entfernen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
-msgstr "_Bitte Kontakt, seinen Status zu sehen"
+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 ..."
+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 ..."
+msgstr "Open_PGP-Schlüssel zuweisen …"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
 msgid "Edit _Groups..."
-msgstr "_Gruppen bearbeiten ..."
+msgstr "_Gruppen bearbeiten …"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5675
+#: ../src/roster_window.py:5733
 msgid "Execute Command..."
-msgstr "_Befehl ausführen ..."
+msgstr "Befehl ausführen …"
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5043
-#: ../src/roster_window.py:5556
+#: ../src/roster_window.py:5101 ../src/roster_window.py:5614
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:7
 msgid "Remo_ve"
-msgstr "_Entfernen"
+msgstr "Ent_fernen"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5053
-#: ../src/roster_window.py:5641
+#: ../src/roster_window.py:5111 ../src/roster_window.py:5699
 msgid "Send Cus_tom Status"
-msgstr "Benutzerdefinierten Status senden"
+msgstr "Benu_tzerdefinierten Status senden"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
-msgstr "Einzelne _Nachricht senden ..."
+msgstr "Einzelne _Nachricht senden …"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:10
 msgid "Send _File..."
-msgstr "_Datei senden ..."
+msgstr "_Datei senden …"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:11
 msgid "Set Custom _Avatar..."
-msgstr "Benutzerdefinierten Avatar wählen ..."
+msgstr "Benutzerdefinierten Avatar wählen …"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:12
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
@@ -2280,54 +2488,53 @@
 
 #: ../data/glade/roster_contact_context_menu.glade.h:14
 msgid "_Allow him/her to see my status"
-msgstr "_Erlaube Kontakt, meinen Status zu sehen"
+msgstr "Erlaube dem Kont_akt, meinen Status zu sehen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5116
-#: ../src/roster_window.py:5593
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5174 ../src/roster_window.py:5651
+#: ../src/roster_window.py:5780
 msgid "_Block"
 msgstr "_Blockieren"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
-msgstr "_Verbiete Kontakt, meinen Status zu sehen"
+msgstr "_Verbiete dem Kontakt, meinen Status zu sehen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:18
 msgid "_Ignore"
-msgstr "Ignorieren"
+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"
+msgstr "Kontakt _verwalten"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:20
 msgid "_Rename..."
-msgstr "_Umbenennen ..."
+msgstr "_Umbenennen …"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:21
 msgid "_Subscription"
 msgstr "_Abonnement"
 
+# TODO: Review by german translators
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5110
-#: ../src/roster_window.py:5587
-#: ../src/roster_window.py:5719
+#: ../src/roster_window.py:5168 ../src/roster_window.py:5645
+#: ../src/roster_window.py:5777
 msgid "_Unblock"
-msgstr "Entblocken"
+msgstr "_Entblocken"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
-msgstr "Ignorieren aufheben"
+msgstr "Ignorieren a_ufheben"
 
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
-msgstr "Kontakt _hinzufügen ..."
+msgstr "_Kontakt hinzufügen …"
 
 #: ../data/glade/roster_window.glade.h:2
 msgid "Fea_tures"
-msgstr "Fähigkei_ten des Servers"
+msgstr "Fea_tures"
 
 #: ../data/glade/roster_window.glade.h:3
 msgid "File _Transfers"
@@ -2343,66 +2550,69 @@
 
 #: ../data/glade/roster_window.glade.h:8
 msgid "Profile, A_vatar"
-msgstr "Profile, A_vatar"
+msgstr "Profil und A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
-msgid "Show Trans_ports"
-msgstr "Zeige Trans_porte"
+msgid "Show Only _Active Contacts"
+msgstr "Nur _aktive Kontakte anzeigen"
 
 #: ../data/glade/roster_window.glade.h:10
-msgid "Show _Offline Contacts"
-msgstr "_Abgemeldete Kontakte anzeigen"
+msgid "Show Trans_ports"
+msgstr "Trans_porte anzeigen"
 
 #: ../data/glade/roster_window.glade.h:11
+msgid "Show _Offline Contacts"
+msgstr "Abgemeldete K_ontakte anzeigen"
+
+#: ../data/glade/roster_window.glade.h:12
 msgid "Show _roster"
 msgstr "_Kontaktliste anzeigen"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "_Konten"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Aktionen"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "In_halte"
 
-#: ../data/glade/roster_window.glade.h:17
-#: ../src/disco.py:1352
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1353
 msgid "_Edit"
-msgstr "_Ändern"
+msgstr "Änd_ern"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
-msgstr "Einzelne _Nachricht senden ..."
+msgstr "Einzelne _Nachricht senden …"
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Ansicht"
 
 #: ../data/glade/search_window.glade.h:1
 msgid "Please wait while retrieving search form..."
-msgstr "Bitte warten Sie, während das Suchformular geladen wird ..."
+msgstr "Bitte warten Sie, während das Suchformular geladen wird …"
 
 #: ../data/glade/search_window.glade.h:2
 msgid "Search"
@@ -2413,19 +2623,17 @@
 msgstr "_Kontakt hinzufügen"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4
-#: ../src/roster_window.py:5744
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5802
 msgid "_Information"
-msgstr "Informationen"
+msgstr "_Informationen"
 
-#: ../data/glade/search_window.glade.h:5
-#: ../src/disco.py:1210
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1211
 msgid "_Search"
 msgstr "_Suche"
 
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
-msgstr "_Los"
+msgstr "L_os"
 
 #: ../data/glade/service_discovery_window.glade.h:2
 msgid "_Address:"
@@ -2437,7 +2645,7 @@
 
 #: ../data/glade/service_registration_window.glade.h:2
 msgid "_Cancel"
-msgstr "_Abbrechen"
+msgstr "Abbre_chen"
 
 #: ../data/glade/service_registration_window.glade.h:3
 msgid "_OK"
@@ -2469,7 +2677,7 @@
 
 #: ../data/glade/single_message_window.glade.h:7
 msgid "Subject:"
-msgstr "Thema:"
+msgstr "Betreff:"
 
 #: ../data/glade/single_message_window.glade.h:8
 msgid "To:"
@@ -2485,15 +2693,19 @@
 
 #: ../data/glade/subscription_request_window.glade.h:1
 msgid "Au_thorize"
-msgstr "_Autorisieren"
+msgstr "Au_torisieren"
 
 #: ../data/glade/subscription_request_window.glade.h:2
 msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Kontakt autorisieren, so dass er Ihren Status sehen kann"
+msgstr "Kontakt autorisieren, sodass er Ihren Status sehen kann"
 
 #: ../data/glade/subscription_request_window.glade.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Autorisierung des Kontakts verweigern, so dass er nicht sehen kann, wann Sie verbunden sind"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Autorisierung des Kontakts verweigern, so dass er Ihren Status nicht sehen "
+"kann"
 
 #: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
@@ -2505,7 +2717,7 @@
 
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
-msgstr "Das Konto auswählen, mit dem Sie synchronisieren möchten"
+msgstr "Das Konto auswählen, das Sie synchronisieren möchten"
 
 #: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
 msgid "Select the contacts you want to synchronise"
@@ -2517,7 +2729,7 @@
 
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Mute Sounds"
-msgstr "_Klänge stummschalten"
+msgstr "Klänge stummschalten"
 
 #: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
@@ -2525,7 +2737,7 @@
 
 #: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
-msgstr "Zeige alle schwebenden _Ereignisse"
+msgstr "Zeige alle neuen _Ereignisse"
 
 #: ../data/glade/systray_context_menu.glade.h:4
 msgid "Show _Roster"
@@ -2548,60 +2760,69 @@
 msgid "<b>Client:</b>"
 msgstr "<b>Client:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+msgid "<b>Contact time:</b>"
+msgstr "<b>Uhrzeit beim Kontakt:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber-ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressource:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Abonnement:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Kommentare"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Gewählter Avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Kontaktinformationen"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Mehr"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Avatar auswählen"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
-msgstr "<b>Jabber Verkehrsdaten</b>"
+msgstr "<b>Jabber-Datentransfer</b>"
 
 #: ../data/glade/xml_console_window.glade.h:2
 msgid "<b>XML Input</b>"
-msgstr "<b>XML Direkteingabe</b>"
+msgstr "<b>XML-Direkteingabe</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Aktivieren"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2624,29 +2845,30 @@
 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:5576
+#: ../src/roster_window.py:5634
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5702
+#: ../src/roster_window.py:5760
 msgid "_Rename"
 msgstr "_Umbenennen"
 
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
-msgstr "_Konto bearbeiten ..."
+msgstr "_Konto bearbeiten …"
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
-msgstr "Lokale JID:"
+msgstr "Lokale Jabber-ID:"
 
 #: ../data/glade/zeroconf_information_window.glade.h:7
 msgid "Personal"
@@ -2664,26 +2886,32 @@
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use _custom port:"
+msgstr "Verwende _benutzerdefinierten Port:"
+
 #: ../src/adhoc_commands.py:264
 msgid "Cancel confirmation"
 msgstr "Bestätigung abbrechen"
 
 #: ../src/adhoc_commands.py:265
-msgid "You are in process of executing command. Do you really want to cancel it?"
-msgstr "Sie sind mittendrin, einen Befehl auszuführen. Wollen Sie wirklich abbrechen?"
+msgid ""
+"You are in process of executing command. Do you really want to cancel it?"
+msgstr ""
+"Sie sind dabei, einen Befehl auszuführen. Wollen Sie wirklich abbrechen?"
 
 #: ../src/adhoc_commands.py:304
 msgid "Service changed the session identifier."
-msgstr "Dienst änderte die Sitzungskennung."
+msgstr "Der Dienst änderte die Sitzungskennung."
 
 #: ../src/adhoc_commands.py:317
 msgid "Service sent malformed data"
-msgstr "Dienst sendete unzureichende Daten"
+msgstr "Der Dienst sendete unzureichende Daten."
 
 #. when stanza doesn't have error description
 #: ../src/adhoc_commands.py:398
 msgid "Service returned an error."
-msgstr "Dienst gab einen Fehler zurück."
+msgstr "Der Dienst gab einen Fehler zurück."
 
 #. For i18n
 #: ../src/advanced.py:97
@@ -2706,8 +2934,7 @@
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102
-#: ../src/chat_control.py:763
+#: ../src/advanced.py:102 ../src/chat_control.py:769
 msgid "Color"
 msgstr "Farbe"
 
@@ -2837,81 +3064,67 @@
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
 
-#: ../src/chat_control.py:335
+#: ../src/chat_control.py:345
 msgid "Spelling language"
 msgstr "Sprache für die Rechtschreibprüfung"
 
 #. we are not connected
-#: ../src/chat_control.py:358
-#: ../src/chat_control.py:546
+#: ../src/chat_control.py:368 ../src/chat_control.py:556
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:359
-#: ../src/chat_control.py:547
+#: ../src/chat_control.py:369 ../src/chat_control.py:557
 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:745
+#: ../src/chat_control.py:751
 msgid "Underline"
-msgstr "Unterstreichen"
+msgstr "Unterstrichen"
 
-#: ../src/chat_control.py:746
+#: ../src/chat_control.py:752
 msgid "Strike"
-msgstr "Durchstreichen"
+msgstr "Durchgestrichen"
 
-#: ../src/chat_control.py:769
+#: ../src/chat_control.py:775
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../src/chat_control.py:778
+#: ../src/chat_control.py:784
 msgid "Clear formating"
-msgstr "Formatierung leeren"
+msgstr "Formatierung löschen"
 
-#: ../src/chat_control.py:1212
-#: ../src/chat_control.py:1614
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/chat_control.py:1220 ../src/chat_control.py:1624
 msgid "GPG encryption enabled"
-msgstr "Verschlüsselung aktiviert"
+msgstr "GPG-Verschlüsselung aktiviert"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1241
-#: ../src/chat_control.py:2108
-#: ../src/common/contacts.py:113
-#: ../src/common/helpers.py:72
-#: ../src/common/helpers.py:302
-#: ../src/conversation_textview.py:860
-#: ../src/dialogs.py:903
-#: ../src/gajim.py:980
-#: ../src/gajim.py:1640
-#: ../src/roster_window.py:911
-#: ../src/roster_window.py:1537
-#: ../src/roster_window.py:1539
-#: ../src/roster_window.py:1870
-#: ../src/roster_window.py:3092
-#: ../src/roster_window.py:3115
-#: ../src/roster_window.py:5237
-#: ../src/roster_window.py:5422
+#: ../src/chat_control.py:1250 ../src/chat_control.py:2126
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:56
+#: ../src/common/helpers.py:227 ../src/conversation_textview.py:862
+#: ../src/dialogs.py:905 ../src/dialogs.py:1653 ../src/gajim.py:988
+#: ../src/gajim.py:1721 ../src/roster_window.py:910
+#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
+#: ../src/roster_window.py:1889 ../src/roster_window.py:3084
+#: ../src/roster_window.py:3110 ../src/roster_window.py:5295
+#: ../src/roster_window.py:5480
 msgid "Not in Roster"
 msgstr "Nicht in der Kontaktliste"
 
-#: ../src/chat_control.py:1373
-#: ../src/tooltips.py:627
+#: ../src/chat_control.py:1383 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Unbekannter Künstler"
 
-#: ../src/chat_control.py:1375
-#: ../src/tooltips.py:632
+#: ../src/chat_control.py:1385 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Unbekannter Titel"
 
-#: ../src/chat_control.py:1377
-#: ../src/tooltips.py:637
+#: ../src/chat_control.py:1387 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Unbekannte Quelle"
 
-#: ../src/chat_control.py:1381
-#: ../src/tooltips.py:639
+#: ../src/chat_control.py:1391 ../src/tooltips.py:639
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -2920,7 +3133,7 @@
 "<b>\"%(title)s\"</b> von <i>%(artist)s</i>\n"
 "von <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1386
+#: ../src/chat_control.py:1396
 #, python-format
 msgid ""
 "%(title)s by %(artist)s\n"
@@ -2929,65 +3142,71 @@
 "%(title)s von %(artist)s\n"
 "von %(source)s"
 
-#: ../src/chat_control.py:1509
+#: ../src/chat_control.py:1519
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
-msgstr "%(nickname)s aus Gruppenchat %(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:1594
-#: ../src/dialogs.py:3913
+#: ../src/chat_control.py:1604 ../src/dialogs.py:3918
 msgid "No GPG key assigned"
 msgstr "Kein GPG-Schlüssel zugewiesen"
 
-#: ../src/chat_control.py:1595
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-msgstr "Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht mit GPG verschlüsselt werden."
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/chat_control.py:1605
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+"Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht mit "
+"GPG verschlüsselt werden."
 
-#: ../src/chat_control.py:1604
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/chat_control.py:1614
 msgid "GPG encryption disabled"
-msgstr "Verschlüsselung deaktiviert"
+msgstr "GPG-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1629
+#: ../src/chat_control.py:1640
 msgid "Session WILL be logged"
 msgstr "Sitzung WIRD aufgezeichnet"
 
-#: ../src/chat_control.py:1631
+#: ../src/chat_control.py:1642
 msgid "Session WILL NOT be logged"
 msgstr "Sitzung WIRD NICHT aufgezeichnet"
 
 #. encryption %s active
-#: ../src/chat_control.py:1645
+#: ../src/chat_control.py:1656
 msgid "is"
 msgstr "ist"
 
-#: ../src/chat_control.py:1645
+#: ../src/chat_control.py:1656
 msgid "is NOT"
 msgstr "ist NICHT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1647
+#: ../src/chat_control.py:1658
 msgid "will"
 msgstr "wird"
 
-#: ../src/chat_control.py:1647
+#: ../src/chat_control.py:1658
 msgid "will NOT"
 msgstr "wird NICHT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1651
+#: ../src/chat_control.py:1662
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1655
+#: ../src/chat_control.py:1666
 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:1661
+#: ../src/chat_control.py:1672
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -2996,109 +3215,118 @@
 "%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n"
 "Ihre Chatsitzung %(logged)s mitgeschrieben."
 
-#: ../src/chat_control.py:1709
+#: ../src/chat_control.py:1720
 msgid "Command not supported for zeroconf account."
-msgstr "Befehl für zeroconf Konto nicht unterstützt."
+msgstr "Der Befehl für das Zeroconf-Konto wird nicht unterstützt."
 
-#: ../src/chat_control.py:1720
-#: ../src/groupchat_control.py:1654
+#: ../src/chat_control.py:1731 ../src/groupchat_control.py:1657
 #, python-format
 msgid "Commands: %s"
 msgstr "Befehle: %s"
 
-#: ../src/chat_control.py:1723
-#: ../src/groupchat_control.py:1668
+#: ../src/chat_control.py:1734 ../src/groupchat_control.py:1671
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Verwendung: /%s, leert das Textfenster."
 
-#: ../src/chat_control.py:1726
-#: ../src/groupchat_control.py:1673
+#: ../src/chat_control.py:1737 ../src/groupchat_control.py:1676
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
-msgstr "Verwendung: /%s, versteckt die Chatbuttons."
+msgstr "Verwendung: /%s, versteckt die Chatschaltflächen."
 
-#: ../src/chat_control.py:1729
-#: ../src/groupchat_control.py:1689
+#: ../src/chat_control.py:1740 ../src/groupchat_control.py:1692
 #, 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 <action>, sendet Aktion im aktuellen Gruppenchat. Verwenden Sie eine dritte Person, z.B. mit /%(command)s explodiert)."
+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:1734
+#: ../src/chat_control.py:1745
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
-msgstr "Verwendung: /%s, sendet einen Ping zum Kontakt"
+msgstr "Verwendung: /%s, sendet einen Ping zum Kontakt."
 
-#: ../src/chat_control.py:1737
+#: ../src/chat_control.py:1748
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
-msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt"
+msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt."
 
-#: ../src/chat_control.py:1740
-#: ../src/groupchat_control.py:1712
+#: ../src/chat_control.py:1751 ../src/groupchat_control.py:1715
 #, python-format
 msgid "No help info for /%s"
-msgstr "Keine Hilfe vorhanden für /%s"
+msgstr "Keine Hilfe vorhanden für /%s."
 
-#: ../src/chat_control.py:1872
+#: ../src/chat_control.py:1884
 msgid "Session negotiation cancelled"
 msgstr "Sitzungsaushandlung abgebrochen"
 
-#: ../src/chat_control.py:1879
+#: ../src/chat_control.py:1891
 msgid "This session is encrypted"
-msgstr "Diese Sitzung ist verschlüsselt"
+msgstr "Diese Sitzung ist verschlüsselt."
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1894
 msgid " and WILL be logged"
-msgstr " und WIRD aufgezeichnet"
+msgstr " und wird AUFGEZEICHNET"
 
-#: ../src/chat_control.py:1884
+#: ../src/chat_control.py:1896
 msgid " and WILL NOT be logged"
-msgstr " und WIRD NICHT aufgezeichnet"
+msgstr " und wird NICHT AUFGEZEICHNET"
 
-#: ../src/chat_control.py:1889
-msgid "Remote contact's identity not verified. Click the shield button for more details."
-msgstr "Identität des Gesprächspartners nicht überprüft. Mehr Informationen durch Klicken auf das Schild-Symbol"
+#: ../src/chat_control.py:1901
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+"Die Identität des Gesprächspartners wurde nicht überprüft. Mehr "
+"Informationen durch Klicken auf das Schild-Symbol."
 
-#: ../src/chat_control.py:1891
+#: ../src/chat_control.py:1903
 msgid "E2E encryption disabled"
-msgstr "Verschlüsselung deaktiviert"
+msgstr "E2E-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1919
-#: ../src/chat_control.py:1932
+#: ../src/chat_control.py:1937 ../src/chat_control.py:1950
 msgid "The following message was NOT encrypted"
-msgstr "[Die folgende Nachricht wurde nicht verschlüsselt]"
+msgstr "Die folgende Nachricht wurde UNVERSCHLÜSSELT übertragen"
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:1943
 msgid "The following message was encrypted"
-msgstr "Die folgende Nachricht war verschlüsselt"
+msgstr "Die folgende Nachricht wurde verschlüsselt übertragen"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2296
+#: ../src/chat_control.py:2314
 #, python-format
 msgid "You just received a new message from \"%s\""
-msgstr "Sie haben eine neue Nachricht von \"%s\""
+msgstr "Sie haben eine neue Nachricht von \"%s\" erhalten"
 
-#: ../src/chat_control.py:2297
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Wenn sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die Nachricht verloren."
+#: ../src/chat_control.py:2315
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Wenn Sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
+"Nachricht verloren."
 
-#: ../src/chat_control.py:2445
-#: ../src/common/connection_handlers.py:1850
-#: ../src/common/connection_handlers.py:1896
-#: ../src/common/connection_handlers.py:2084
-#: ../src/common/connection_handlers.py:2217
-#: ../src/common/connection.py:1260
-#: ../src/gajim.py:178
+#: ../src/chat_control.py:2463 ../src/common/connection_handlers.py:1964
+#: ../src/common/connection_handlers.py:2010
+#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2331 ../src/common/connection.py:1344
+#: ../src/gajim.py:158
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: ../src/chat_control.py:2446
+#: ../src/chat_control.py:2464
 #, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
-msgstr "Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie diese zu reparieren oder zu löschen (dabei werden alle Verläufe verloren gehen)."
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+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:2682
+#: ../src/chat_control.py:2700
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ist jetzt %(status)s"
@@ -3107,17 +3335,14 @@
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:111
-#: ../src/common/check_paths.py:122
+#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
 #: ../src/common/check_paths.py:129
 #, python-format
 msgid "%s is a file but it should be a directory"
-msgstr "%s ist eine Datei, aber es sollte ein Verzeichnis sein"
+msgstr "%s ist eine Datei, sollte aber ein Verzeichnis sein"
 
-#: ../src/common/check_paths.py:112
-#: ../src/common/check_paths.py:123
-#: ../src/common/check_paths.py:130
-#: ../src/common/check_paths.py:138
+#: ../src/common/check_paths.py:112 ../src/common/check_paths.py:123
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:138
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
@@ -3131,138 +3356,156 @@
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Ändere Statusinformation"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
-msgstr "Kontakt hat Status verändert"
+msgstr "Status ändern"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
-msgstr "Lege den Anwesenheitstyp und die Beschreibung fest"
+msgstr "Status und Beschreibung festlegen"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Längere Zeit abwesend"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Bitte nicht stören"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Offline - Abgemeldet"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
-msgstr "Anwesenheitsbeschreibung:"
+msgstr "Statusbeschreibung:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Der Status hat sich verändert."
 
-#: ../src/common/commands.py:177
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
-msgstr "Verlasse Gruppenchat"
+msgstr "Verlasse Chaträume"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s aus Gruppenchat %(room_jid)s"
+msgstr "%(nickname)s aus dem Chatraum %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
-msgstr "Sie haben keinen Gruppenchat betreten."
+msgstr "Sie sind derzeit in keinem Chatraum."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
-msgstr "Wählen Sie den Gruppenchat, den Sie verlassen möchten"
+msgstr "Wählen Sie die Chaträume, die Sie verlassen möchten"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206
-#: ../src/common/contacts.py:94
-#: ../src/common/helpers.py:72
-#: ../src/roster_window.py:785
-#: ../src/roster_window.py:1541
-#: ../src/roster_window.py:1543
-#: ../src/roster_window.py:5013
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:56 ../src/roster_window.py:784
+#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
+#: ../src/roster_window.py:5071
 msgid "Groupchats"
 msgstr "Gruppenchat"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
-msgstr "Sie haben folgende Gruppenchats verlassen:"
+msgstr "Sie haben folgende Chaträume verlassen:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Ungelesene Nachrichten weiterleiten"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Alle ungelesenen Nachrichten wurden weitergeleitet."
 
 #: ../src/common/config.py:82
+msgid "Play sound when user is busy"
+msgstr "Klang abspielen, wenn der Benutzer beschäftigt ist"
+
+#: ../src/common/config.py:83
 msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
+msgstr ""
+"Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
 
-#: ../src/common/config.py:87
-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:85
+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:88
+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:89
 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:88
+#: ../src/common/config.py:89
 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."
+msgstr ""
+"$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die "
+"Abwesenheitszeit."
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:91
 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:91
+#: ../src/common/config.py:92
 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:91
+#: ../src/common/config.py:92
 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."
+msgstr ""
+"$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Nicht-"
+"Verfügbar-Zeit."
 
-#: ../src/common/config.py:111
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Liste (getrennt durch Leerzeichen) von Zeilen (Kontos und Gruppen), die eingeklappt sind."
+# FIXME: Check English
+#: ../src/common/config.py:102
+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'."
 
-#. sorted alphanum
 #: ../src/common/config.py:112
-#: ../src/common/config.py:461
-#: ../src/common/optparser.py:217
-#: ../src/common/optparser.py:435
-#: ../src/common/optparser.py:469
-#: ../src/gajim.py:3128
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Liste (getrennt durch Leerzeichen) von Zeilen (Konten und Gruppen), die "
+"eingeklappt sind."
+
+#. sorted alphanum
+#: ../src/common/config.py:113 ../src/common/config.py:465
+#: ../src/common/optparser.py:221 ../src/common/optparser.py:439
+#: ../src/common/optparser.py:473 ../src/gajim.py:3262
 msgid "default"
 msgstr "Standard"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:117
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Aktiviere Anzeige von Kontakten im LAN über Zeroconf."
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
 msgid "Language used by speller"
 msgstr "Sprache der Rechtschreibprüfung"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3272,170 +3515,293 @@
 "'sometimes' - Zeige Zeit alle print_ichat_every_foo_minutes Minuten.\n"
 "'never' - Zeige nie die Zeit."
 
-#: ../src/common/config.py:121
-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 "Zeige die Zeit in Chats mittels ungenauer Uhr an. Werte für die Ungenauigkeit sind 1 bis 4 oder 0, um die ungenaue Uhr zu deaktivieren. 1 ist am Genauesten, 4 ist am Ungenaueste. Dies wird nur verwendet, wenn print_time auf 'sometimes' gesetzt ist."
+#: ../src/common/config.py:122
+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 ""
+"Zeige die Zeit in Chats mittels ungenauer Uhr an. Werte für die "
+"Ungenauigkeit sind 1 bis 4, je höher, desto ungenauer. 0 deaktiviert die "
+"ungenaue Uhr. Die ungenaue Uhr wird nur verwendet, wenn print_time auf "
+"'sometimes' gesetzt ist."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
-#: ../src/common/config.py:125
-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:126
+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:128
-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 "Verwendet ReStructuredText Text-Markup für HTML, und ASCII-Formatierung falls aktiviert. Informationen zur Syntax finden Sie unter http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch). (Falls Sie das wünschen, installieren Sie docutils)"
+#: ../src/common/config.py:129
+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 ""
+"Verwendet ReStructuredText als Text-Markup für HTML und ASCII-Formatierung, "
+"falls aktiviert. Informationen zur Syntax finden Sie unter http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch). (Falls Sie "
+"dieses Feature benutzen möchten, installieren Sie docutils.)"
 
-#: ../src/common/config.py:137
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Zeichen, das hinter Spitznamen angezeigt wird, wenn Spitznamenvervollständigung (Tab) im Gruppenchat verwendet wird."
-
 #: ../src/common/config.py:138
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Zeichen, das hinter den gewünschten Spitznamen gehängt wird, falls der gewünschte Name im Gruppenchat bereits vergeben ist."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Zeichen, das hinter Spitznamen angezeigt wird, wenn die "
+"Spitznamenvervollständigung (Tab) in Chaträumen verwendet wird."
 
-#: ../src/common/config.py:165
-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 "Hiermit lässt sich der Zeitstempel anpassen, der in den Unterhaltungen verwendet wird. Zum Beispiel wird \"[%H:%M] \" zu \"[Stunde:Minute] \". Weitere Informationen finden Sie in der Python-Dokumentation zu \"strftime\" unter http://docs.python.org/lib/module-time.html (Englisch)."
+#: ../src/common/config.py:139
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Zeichen, das an den gewünschten Spitznamen gehängt wird, falls der dieser im "
+"Chatraum bereits vergeben ist."
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:167
+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 ""
+"Hiermit lässt sich der Zeitstempel anpassen, der in den Unterhaltungen "
+"verwendet wird. Zum Beispiel wird \"[%H:%M] \" zu \"[Stunde:Minute] \". "
+"Weitere Informationen finden Sie in der Python-Dokumentation zu \"strftime\" "
+"unter http://docs.python.org/lib/module-time.html (Englisch)."
+
+#: ../src/common/config.py:168
 msgid "Characters that are printed before the nickname in conversations"
-msgstr "Zeichen, die vor dem Spitzname gedruckt werden"
+msgstr "Zeichen, die vor dem Spitznamen ausgegeben werden"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:169
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Zeichen, die nach dem Spitznamen gedruckt werden"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:173
 msgid "Add * and [n] in roster title?"
-msgstr "Füge * und [n] in den Titel der Kontaktleiste ein?"
+msgstr "Sollen * und [n] in den Titel der Kontaktleiste eingefügt werden?"
 
-#: ../src/common/config.py:173
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Wie viele Zeilen von der vorherigen Unterhaltung gespeichert werden, wenn ein Chat Tab/Fenster wieder geöffnet wird."
-
 #: ../src/common/config.py:174
-msgid "How many minutes should last lines from previous conversation last."
-msgstr "Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Wie viele Zeilen von der vorherigen Unterhaltung angezeigt werden, wenn ein "
+"Tab/Fenster wieder geöffnet wird."
 
 #: ../src/common/config.py:175
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch (Mirabilis ICQ-Client Standardeinstellung)."
+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:177
+#: ../src/common/config.py:176
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
+"(Standardeinstellung im ICQ-Client Mirabilis)."
+
+#: ../src/common/config.py:178
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:181
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Entweder eine spezielle URL mit %s, wobei %s das Word/Phrase ist oder 'WIKTIONARY', was bedeutet, dass das Wörterbuch Wiktionary verwendet wird."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+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:183
+#: ../src/common/config.py:184
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert werden."
+msgstr ""
+"Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert "
+"werden."
 
-#: ../src/common/config.py:184
-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 False and they sync with global status) based upon the status of the network connection."
-msgstr "Falls aktiviert, reagiere auf D-Bus-Signale vom NetworkManager und ändere den Status von Konten (vorausgesetzt, sie haben listen_to_network_manager nicht auf False gesetzt und sie synchronisieren sich mit dem globalen Status) basierend auf dem Status der Netzwerkverbindung."
-
 #: ../src/common/config.py:185
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Senden von Chatstatus-Benachrichtigungen. Kann \"all\", \"composing_only\" oder \"disabled\" sein."
+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 "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Falls aktiviert, wird auf D-Bus-Signale vom NetworkManager reagiert und der "
+"Status wird abhängig vom Status der Netzwerkverbindung gesetzt "
+"(vorausgesetzt, Sie haben listen_to_network_manager nicht auf False gesetzt "
+"und Ihre Konten synchronisieren sich mit dem globalen Status)."
 
 #: ../src/common/config.py:186
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Angezeigte Chatstatus-Benachrichtigungen im Chatfenster. Kann all, composing_only oder disabled sein."
+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:188
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll (print_time==sometimes), zeige sie alle x Minuten."
+#: ../src/common/config.py:187
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Angezeigte Chatstatus-Benachrichtigungen im Chatfenster. Kann auf \"all\", "
+"\"composing_only\" oder \"disabled\" gesetzt werden."
 
 #: ../src/common/config.py:189
-msgid "Ask before closing a group chat tab/window."
-msgstr "Fragen, bevor ein Gruppenchat Tab/Fenster geschlossen wird."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+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:190
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Immer fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-separierten Liste von Gruppchatnamen geschlossen wird."
+msgid "Ask before closing a group chat tab/window."
+msgstr "Fragen, bevor ein Chatraum-Tab oder -Fenster geschlossen wird."
 
 #: ../src/common/config.py:191
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Niemals fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-seperierten Liste von Gruppenchatnamen geschlossen wird."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Immer fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
+"Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:194
-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 "Kommagetrennte Liste von FQHNs die zusätzlich zum lokalen Rechnernamen gesendet werden, für Datenübertragung im Fall von NAT/Port-Forwarding."
+#: ../src/common/config.py:192
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Niemals fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
+"Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:195
+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 ""
+"Kommagetrennte Liste von vollständigen Hostnamen oder IP-Adressen, die bei "
+"Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Rechnernamen "
+"gesendet werden."
+
+#: ../src/common/config.py:197
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC-Standard sagt KiB = 1024 Byte, kB = 1000 Byte."
+msgstr "Der IEC-Standard legt fest: 1 KiB = 1024 Byte, 1 kB = 1000 Byte."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:199
 msgid "Notify of events in the system trayicon."
-msgstr "Benachrichtige über Ereignisse durch das Trayicon"
+msgstr "Neue Ereignisse per Trayicon anzeigen"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:205
 msgid "Show tab when only one conversation?"
-msgstr "Tab bei einer einzelnen Unterhaltung anzeigen?"
+msgstr "Tableiste bei nur einer Unterhaltung anzeigen?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:206
 msgid "Show tabbed notebook border in chat windows?"
-msgstr "Tab-Grenze im Chat-Fenster anzeigen?"
+msgstr "Tab-Grenze im Chatfenster anzeigen?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:207
 msgid "Show close button in tab?"
-msgstr "Schließen-Button im Tab anzeigen?"
+msgstr "Schließen-Schaltflächen in Tabs anzeigen?"
 
-#: ../src/common/config.py:207
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "Soll Gajim beim Aushandeln einer verschlüsselten Sitzung annehmen, dass Sie Ihre Nachricht mitschneiden wollen?"
-
 #: ../src/common/config.py:208
-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 numbers are more secure, but take longer to calculate when you start a session."
-msgstr "Eine Liste von MODP-Gruppen, welche in Diffie-Hellman benutzt werden sollen. Vorzug in Reihenfolge, getrennt durch Kommata. Zulässige Gruppen sind 1, 2, 5, 14, 15, 16, 17 und 18. Größere Werte sind sicherer, benötigen jedoch beim Start einer neuen Unterhaltung mehr Rechenzeit."
+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 "
+"numbers are more secure, but take longer to calculate when you start a "
+"session."
+msgstr ""
+"Eine Liste von MODP-Gruppen, die im Diffie-Hellman-Schlüsselaustausch "
+"benutzt werden sollen. Priorität nach Nennungsreihenfolge, getrennt durch "
+"Kommata. Zulässige Gruppen sind 1, 2, 5, 14, 15, 16, 17 und 18. Größere "
+"Werte sind sicherer, benötigen jedoch beim Start einer neuen Unterhaltung "
+"mehr Rechenzeit."
 
 #: ../src/common/config.py:217
 msgid "Preview new messages in notification popup?"
-msgstr "Vorschau neuer Nachrichten in der Popup-Benachrichtigung?"
+msgstr "Vorschau neuer Nachrichten in der Popup-Benachrichtigung anzeigen?"
 
 #: ../src/common/config.py:222
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Eine mit Semikolon separierte Liste von Worten, die in einem Gruppenchat hervorgehoben werden."
+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:223
-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 "Falls aktiviert, wird Gajim beendet, wenn der X-Button des Fenstermanagers geklickt wird. Diese Option wird nur beachtet, wenn Trayicon verwendet wird."
+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 ""
+"Falls aktiviert, wird Gajim beendet, wenn der X-Button des Fenstermanagers "
+"geklickt wird. Diese Option funktioniert nur, wenn das Trayicon verwendet "
+"wird."
 
 #: ../src/common/config.py:224
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Falls aktiviert, wird Gajim beim Starten überprüfen, ob Gajim der Standard-Jabber-Client ist."
+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:225
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Falls aktiviert, wird Gajim ein Icon auf jedem Tab mit ungelesenen Nachrichten anzeigen. Abhängig vom Theme kann dieses Icon animiert sein."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+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:226
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Falls aktiviert, wird Gajim für jeden Kontakt die Statusnachricht, sofern nicht leer, unter dem jeweiligen Kontaktnamen in der Kontaktliste anzeigen."
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+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:231
 msgid "Define the position of the avatar in roster. Can be left or right"
-msgstr "Definiere die Position des Avatars in der Kontaktliste. \"left\" (links) oder \"right\" (rechts) sind mögliche Optionen."
+msgstr ""
+"Legt die Position des Avatars in der Kontaktliste fest. \"left\" (links) "
+"oder \"right\" (rechts) sind mögliche Optionen."
 
 #: ../src/common/config.py:232
-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 "Falls aktiviert, fragt Gajim nach einem Avatar für jeden Kontakt, der beim letzten Mal keinen hatte oder dessen gespeicherter Avatar zu alt ist."
+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 ""
+"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:233
-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 "Falls deaktiviert, werden Sie keine Statuszeile im Chat sehen, wenn ein Kontakt seinen Status und/oder seine Statusnachricht ändert."
+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 ""
+"Falls deaktiviert, wird keine Statuszeile im Chat angezeigt, wenn ein "
+"Kontakt seinen Status oder seine Statusnachricht ändert."
 
 #: ../src/common/config.py:234
-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 status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves group chat."
-msgstr "Kann \"none\", \"all\" oder \"in_and_out\" sein. Falls \"none\", wird Gajim keine Status-Zeilen mehr in Gruppenchats anzeigen, wenn ein Mitglied seinen Status oder seine Statusnachricht ändert. Falls \"all\", wird Gajim alle Statusnachrichten anzeigen. Falls \"in_and_out\", wird Gajim nur einen Status anzeigen, wenn jemand den Gruppenchat betritt oder verlässt."
+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 "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"Kann \"none\", \"all\" oder \"in_and_out\" sein. Falls \"none\", werden "
+"keine Status-Zeilen mehr in Chaträumen angezeigt, wenn jemand seinen Status "
+"oder seine Statusnachricht ändert. Falls \"all\", werden alle "
+"Statusnachrichten anzeigt. Falls \"in_and_out\", wird nur dann ein Status "
+"angezeigt, wenn jemand den Chatraum betritt oder verlässt."
 
 #: ../src/common/config.py:236
 msgid "Background color of contacts when they just signed in."
@@ -3446,401 +3812,557 @@
 msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade abgemeldet haben."
 
 #: ../src/common/config.py:239
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Falls aktiviert, werden wiederhergestellte Nachrichten mit einer kleineren Schrift als der Standard dargestellt."
+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:240
 msgid "Don't show avatar for the transport itself."
-msgstr "Zeige keinen Avatar für den Transport selber."
+msgstr "Zeige keinen Avatar für den Transport selbst an."
 
 #: ../src/common/config.py:241
 msgid "Don't show roster in the system taskbar."
-msgstr "Kontaktliste nicht in der System-Taskleiste anzeigen."
+msgstr "Kontaktliste nicht in der Taskleiste anzeigen."
 
 #: ../src/common/config.py:242
-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 "Falls aktiviert und die installierten GTK+ und PyGTK Versionen wenigstens 2.8 sind, lasse das Fenster bei neuen Ereignissen aufblitzen (Standardverhalten in den meisten Window-Managern), wenn anstehende Ereignisse vorliegen."
+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 ""
+"Falls aktiviert blitzt das Fenster bei neuen Ereignissen auf, wenn neue "
+"Ereignisse anstehen (Standardverhalten der meisten Fenster-Manager; benötigt "
+"GTK+ und PyGTK >= Version 2.8)."
 
 #: ../src/common/config.py:244
-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 presences."
-msgstr "Jabberd1.4 mag keine SHA-Informationen wenn ein passwortgeschützter Gruppenchat betreten wird. Deaktivieren Sie diese Option um keine SHA-Informationen in Gruppenchats zu senden"
+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 "
+"presences."
+msgstr ""
+"Jabberd1.4 verarbeitet keine SHA-Informationen, wenn ein passwortgeschützter "
+"Chatraum betreten wird. Falls aktiviert, werden in Chaträumen keine SHA-"
+"Informationen gesendet."
 
 #. always, never, peracct, pertype should not be translated
 #: ../src/common/config.py:247
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
-"'always_with_roster' - Like 'always' but the messages are in a single window along with the roster.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window."
 msgstr ""
-"Kontrolliert das Fenster in dem neue Nachrichten platziert werden.\n"
-"'Immer' - Alle Nachrichten landen in einem einzelnen Fenster.\n"
-"'Immer in der Kontaktliste' - Wie 'Immer', aber die Nachrichten sind in einem einzelnen Fenster zusammen mit der Kontaktliste.\n"
-"'Niemals' - Alle Nachrichten bekommen ihr eigenes Fenster.\n"
-"'Pro Konto' - Nachrichten für jedes Konto landen in einem speziellen Fenster.\n"
-"'Pro Typ' - Jede Nachrichtentyp (z.B. Chat vs. Gruppenchat) landet in einem speziellen Fenster. Falls Sie diese Option ändern, muss Gajim neu gestartet werden, damit die Änderungen übernommen werden"
+"Kontrolliert das Fenster, in dem neue Nachrichten angezeigt werden.\n"
+"'Immer' - Alle Nachrichten landen in einem einzigen Fenster.\n"
+"'Immer in der Kontaktliste' - Wie 'Immer', die Nachrichten teilen sich "
+"jedoch ein Fenster mit der Kontaktliste.\n"
+"'Niemals' - Alle Nachrichten werden in eigenen Fenstern angezeigt.\n"
+"'Pro Konto' - Jedes Konto besitzt ein eigenes Fenster, in dem die "
+"Nachrichten angezeigt werden.\n"
+"'Pro Typ' - Jeder Nachrichtentyp (z.B. Chat oder Gruppenchat) landet in "
+"einem eigenen Fenster. Eine Änderung dieser Option tritt erst nach einem "
+"Neustart von Gajim in Kraft."
 
 #: ../src/common/config.py:248
 msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Falls deaktiviert, werden Sie den Avatar nicht mehr im Chatfenster sehen."
+msgstr ""
+"Falls deaktiviert, wird der Avatar nicht mehr im Chatfenster angezeigt."
 
 #: ../src/common/config.py:249
 msgid "If True, pressing the escape key closes a tab/window."
-msgstr "Falls aktiviert, schließt die Escape-Taste ein Tab/Fenster."
+msgstr "Falls aktiviert, schließt die Escape-Taste aktive Tabs und Fenster."
 
 #: ../src/common/config.py:250
 msgid "Hides the buttons in chat windows."
-msgstr "Versteckt die Knöpfe im Gruppenchat-Fenster."
+msgstr "Versteckt die Schaltflächen im Chatraum-Fenster."
 
 #: ../src/common/config.py:251
 msgid "Hides the banner in a group chat window"
-msgstr "Versteckt das Banner im Gruppenchat-Fenster"
+msgstr "Versteckt das Banner im Chatraum-Fenster."
 
 #: ../src/common/config.py:252
 msgid "Hides the banner in two persons chat window"
-msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster"
+msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster."
 
 #: ../src/common/config.py:253
 msgid "Hides the group chat occupants list in group chat window."
-msgstr "Versteckt die Gruppenchat-Benutzerliste im Gruppenchat-Fenster."
+msgstr "Versteckt die Benutzerliste im Chatraum-Fenster."
 
 #: ../src/common/config.py:254
-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 "Zeige in einem Chat den Spitznamen nur dann am Beginn einer Linie, wenn es nicht die selbe Person ist, die schon die letzte Nachricht geschrieben hat."
+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 ""
+"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:255
 msgid "Indentation when using merge consecutive nickname."
-msgstr "Einrückung, wenn das Zusammenführen nachfolgender Spitznamen verwendet wird."
+msgstr ""
+"Einrückung einfügen, wenn das Zusammenführen nachfolgender Spitznamen "
+"verwendet wird."
 
 #: ../src/common/config.py:256
 msgid "Smooth scroll message in conversation window"
-msgstr "Sanftes Scrollen der Nachricht im Unterhaltungsfenster"
+msgstr "Sanften Bildlauf im Unterhaltungsfenster verwenden"
 
 #: ../src/common/config.py:257
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
-msgstr "Farbliste, getrennt durch \":\", die zum Einfärben der Spitznamen in Gruppenchats verwendet wird."
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Liste der Farben, die zum Einfärben der Spitznamen in Chaträumen verwendet "
+"werden sollen (Werte getrennt durch \":\")."
 
 #: ../src/common/config.py:258
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Strg+Tab, um zum nächsten Reiter zu gehen, wenn kein anderer neue Nachrichten enthält."
+msgstr ""
+"Strg+Tab, um zum nächsten Tab zu wechseln, wenn kein anderer Tab ungelesene "
+"Nachrichten enthält."
 
 #: ../src/common/config.py:259
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt werden oder nicht? Bei leerer Zeichenfolge wird der Dialog nie gezeigt."
+msgid ""
+"Should we show the confirm metacontacts creation 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:260
-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 "Falls aktiviert, werden Sie in der Lage sein, eine negative Priorität für Ihr Konto im Konto-Bearbeiten Fenster zu setzen. SEIEN SIE VORSICHTIG, wenn Sie mit einer negativen Priorität angemeldet sind: Sie werden KEINE Nachrichten mehr von Ihrem Server erhalten."
+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 ""
+"Falls aktiviert, können Sie eine negative Priorität im Konto-Bearbeiten-"
+"Fenster setzen. VORSICHT: Wenn Sie mit einer negativen Priorität angemeldet "
+"sind ehalten Sie keine Nachrichten mehr vom Server."
 
 #: ../src/common/config.py:261
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Falls aktiviert, wird Gnome Keyring (falls verfügbar) verwendet, um die Passwörter der Konten zu speichern."
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Falls aktiviert, wird der Gnome-Schlüsselbund (falls verfügbar) verwendet, "
+"um die Passwörter der Konten zu speichern."
 
 #: ../src/common/config.py:262
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Falls aktiviert, wird Gajim die Anzahl der angemeldeten und gesamten Kontakte in den Konto- und Gruppenreihen anzeigen."
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Falls aktiviert, wird die Anzahl der angemeldeten und gesamten Kontakte in "
+"den Konto- und Gruppenreihen angezeigt."
 
 #: ../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 "Kann leer, 'chat' oder 'normal' sein. Wenn nicht leer, dann werden alle eingehenden Nachrichten so behandelt, als wären sie von diesem Typ."
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+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: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 "Falls aktiviert, wird Gajim automatisch zu der Person springen und auswählen, die die letzte Nachricht geschickt hat, falls das Chat-Fenster nicht bereits offen ist."
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Falls aktiviert, wird Gajim automatisch zu der Person springen und diese "
+"auswählen, die die letzte Nachricht geschickt hat, falls das Chatfenster "
+"nicht bereits geöffnet ist."
 
 #: ../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 "Falls aktiviert, wird Gajim eine Zeichenkette zwischen $$ und $$ mittels dvips vor dem Einfügen in ein Chat-Fenster in ein Bild umwandeln."
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+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:266
 msgid "Time of inactivity needed before the change status window closes down."
-msgstr "Benötigte Inaktivitäts-Zeit bevor das \"Status ändern\"-Fenster geschlossen wird."
+msgstr ""
+"Wartezeit, bevor das \"Status ändern\"-Fenster automatisch geschlossen wird."
 
 #: ../src/common/config.py:267
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
-msgstr "Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten Zeilen werden gelöscht."
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten "
+"Zeilen werden gelöscht."
 
 #: ../src/common/config.py:268
-msgid "If True, notification windows from notification-daemon will be attached to systray icon."
-msgstr "Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst an das Systray-Icon angehängt."
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+"Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst "
+"an das Systray-Icon angehängt."
 
 #: ../src/common/config.py:269
 msgid "Choose interval between 2 checks of idleness."
-msgstr "Wählen Sie einen Zeitabstand zwischen zwei Leerlaufüberprüfungen."
+msgstr "Legen Sie den Zeitabstand zwischen den Leerlaufüberprüfungen fest."
 
 #: ../src/common/config.py:270
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
-msgstr "Wert ändern um LaTeX-Anzeigengröße zu ändern. Hoher Wert resultiert in großer Anzeige."
+msgid ""
+"Change the value to change the size of latex formulas displayed. The higher "
+"is larger."
+msgstr ""
+"Legt die LaTeX-Anzeigengröße fest. Je höher der Wert, desto größer die "
+"Anzeige."
 
 #: ../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 seperately)"
-msgstr "Gültige URI Schemata. Nur Schemata in dieser Liste werden als \"wirkliche\" URI akzeptiert. (mailto und xmpp werden seperat verarbeitet)"
+#, fuzzy
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
+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:282
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Die Priorität wird automatisch dem Status entsprechend geändert. Prioritäten sind in den autopriority_* Optionen definiert."
+#: ../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:290
-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 "Status bei automatischer Verbindung. Wahleise: Angemeldet, Frei zum Chatten, Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar."
+#: ../src/common/config.py:283
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Die Priorität ändert sich automatisch gemäß dem Status. Die Prioritäten "
+"werden in den \"autopriority_*\"-Optionen festgelegt."
 
 #: ../src/common/config.py:291
+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 ""
+"Status bei automatischer Verbindung. Mögliche Werte: Angemeldet, Frei zum "
+"Chatten, Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar. (Diese Option "
+"kann nur verwendet werden, wenn \"restore_last_status\" deaktiviert ist.)"
+
+#: ../src/common/config.py:292
 msgid "If enabled, restore the last status that was used."
-msgstr "Falls aktiviert, wird die letzte Statusmeldung wiederhergestellt."
+msgstr ""
+"Falls aktiviert, wird die zuletzt eingestellte Statusmeldung verwendet."
 
-#: ../src/common/config.py:296
-msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr "Falls deaktiviert, wird die Anwesenheit nicht mit einem GPG-Schlüssel signiert, wenn GPG konfiguriert ist."
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/common/config.py:297
+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:298
+#: ../src/common/config.py:299
 msgid "Enable ESessions encryption for this account."
-msgstr "Aktiviere ESessions-Verschlüsselung für dieses Konto."
+msgstr "Aktiviere die ESession-Verschlüsselung für dieses Konto."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:300
 msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr "Wenn möglich, soll Gajim ESession-Verschlüsselung automatisch starten?"
+msgstr ""
+"Soll die ESession-Verschlüsselung automatisch gestartet werden, wenn möglich?"
 
-#: ../src/common/config.py:300
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
-msgstr "Geordnete Liste (mit Leerzeichen getrennt) zu versuchender Verbindungstypen. Kann tls, ssl oder plain enthalten"
-
 #: ../src/common/config.py:301
-msgid "Show a warning dialog before sending password on an plaintext connection."
-msgstr "Zeige eine Warnmeldung bevor das Passwort über eine unsichere Verbindung übertragen wird."
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+"Geordnete Liste der auszuprobierenden Verbindungstypen (getrennt durch "
+"Leerzeichen). Mögliche Werte sind TLS, SSL und PLAIN."
 
 #: ../src/common/config.py:302
+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:303
 msgid "Show a warning dialog before using standard SSL library."
-msgstr "Zeige eine Warnmeldung bevor das Passwort über eine mit Standard-SSL-Bibliothek geschützten Verbindung übertragen wird."
+msgstr ""
+"Warnmeldung anzeigen, bevor das Passwort über eine mit der Standard-SSL-"
+"Bibliothek geschützte Verbindung übertragen wird."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:305
 msgid "Space separated list of ssl errors to ignore."
-msgstr "Leerzeichen getrennte Liste von SSL-Fehler, die zu ignorieren sind."
+msgstr ""
+"Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:316
-msgid "How many seconds to wait for the answer of keepalive packet before we try to reconnect."
-msgstr "Wartezeit in Sekunden auf Verbindungsprüfantwort vor Versuch Verbindung wieder herzustellen."
+#: ../src/common/config.py:317
+msgid ""
+"How many seconds to wait for the answer of keepalive packet before we try to "
+"reconnect."
+msgstr "Wartezeit in Sekunden, bevor eine Verbindung wieder hergestellt wird."
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:321
 msgid "Jabberd2 workaround"
-msgstr "Jabberd2 Workaround"
+msgstr "Jabberd2-Workaround"
 
-#: ../src/common/config.py:324
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Falls aktiviert, wird Gajim Ihre IP und die in der file_transfer_proxies Option definierten Proxies für den Datentransfer verwenden."
+#: ../src/common/config.py:325
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Falls aktiviert, wird Gajim Ihre IP-Adresse und die in der "
+"file_transfer_proxies Option definierten Proxys für den Dateitransfer "
+"verwenden."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:339
 msgid "Answer to receipt requests"
 msgstr "Antwort auf Empfangsbestätigungsanfragen"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:340
 msgid "Sent receipt requests"
-msgstr "Empfangsbestätigungsanfragen senden"
+msgstr "Empfangsbestätigungen anfordern"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:348
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Soll beim Aushandeln einer verschlüsselten Sitzung angenommen werden, dass "
+"Sie Ihre Nachrichten aufzeichnen wollen?"
+
+#: ../src/common/config.py:406
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
 
-#: ../src/common/config.py:403
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
-msgstr "Wenn möglich, soll Gajim eine ESession-Verschlüsselung mit diesem Kontakt automatisch starten?"
-
-#: ../src/common/config.py:404
 #: ../src/common/config.py:407
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+"Soll automatisch eine ESession-Verschlüsselung mit diesem Kontakt gestartet "
+"werden?"
+
+#: ../src/common/config.py:408 ../src/common/config.py:411
 msgid "Language for which we want to check misspelled words"
-msgstr "Sprache, für die nach falsch geschriebenen Wörtern gesucht werden soll"
+msgstr "Sprache, die für die Rechtschreibprüfung verwerdet werden soll"
 
-#: ../src/common/config.py:413
+# TODO: Review by german translators: getrennte Status || getrennter Status
+#: ../src/common/config.py:417
 msgid "all or space separated status"
-msgstr "alle oder Leerzeichen-getrennter Status"
+msgstr "alle oder durch Leerzeichen getrennte Status"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:418
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nein' oder 'beide'"
 
-#: ../src/common/config.py:415
-#: ../src/common/config.py:417
-#: ../src/common/config.py:418
-#: ../src/common/config.py:421
-#: ../src/common/config.py:422
+#: ../src/common/config.py:419 ../src/common/config.py:421
+#: ../src/common/config.py:422 ../src/common/config.py:425
+#: ../src/common/config.py:426
 msgid "'yes', 'no' or ''"
 msgstr "'ja, 'nein' oder ''"
 
-#: ../src/common/config.py:428
-#: ../src/common/pep.py:159
+#: ../src/common/config.py:432 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:433
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:433
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:430
-#: ../src/common/pep.py:129
+#: ../src/common/config.py:434 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:434
 msgid "I'm eating, so leave me a message."
-msgstr "Ich esse gerade."
+msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:435
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:435
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:432
-#: ../src/common/pep.py:188
+#: ../src/common/config.py:436 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Arbeiten"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:436
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:437
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:437
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:438
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:438
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:442
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:443
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: ../src/common/config.py:440
-#: ../src/config.py:1451
+#: ../src/common/config.py:444 ../src/config.py:1407
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:445
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:446
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: ../src/common/config.py:443
-#: ../src/common/config.py:444
+#: ../src/common/config.py:447 ../src/common/config.py:448
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:454
-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 "Abzuspielender Ton, falls eine Gruppenchat-Nachricht eines der Wörter aus der muc_highlights_works-Liste oder Ihren Spitznamen enthält."
+#: ../src/common/config.py:458
+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 ""
+"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:455
+#: ../src/common/config.py:459
 msgid "Sound to play when any MUC message arrives."
-msgstr "Ton der beim empfangen einer Gruppenchat-Nachricht abgespielt werden soll"
+msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
 
-#: ../src/common/config.py:464
-#: ../src/common/optparser.py:231
+#: ../src/common/config.py:468 ../src/common/optparser.py:235
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:468
-#: ../src/common/optparser.py:217
+#: ../src/common/config.py:472 ../src/common/optparser.py:221
 msgid "grocery"
 msgstr "Lebensmittel"
 
-#: ../src/common/config.py:472
+#: ../src/common/config.py:476
 msgid "human"
-msgstr "menschlich"
+msgstr "Menschlich"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:480
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:72
+#: ../src/common/connection_handlers.py:74
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
-msgstr "Konnte Idle-Modus nicht laden"
+msgstr "Konnte Idle-Modul nicht laden"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:236
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Falscher Server"
 
-#: ../src/common/connection_handlers.py:235
+# TODO: Review by german translators. Get closer to original string and write instead: Ungültige lokale Adresse? :-O
+#: ../src/common/connection_handlers.py:237
 msgid "Invalid local address? :-O"
-msgstr "Ungültige Lokale Adresse? :-O"
+msgstr "Ungültige Lokale Adresse!"
 
-#: ../src/common/connection_handlers.py:640
+#: ../src/common/connection_handlers.py:670
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registrierungsinformation für Transport %s sind nicht rechtzeitig angekommen"
+msgstr ""
+"Die Registrierungsinformation für den Transport %s sind nicht rechtzeitig "
+"angekommen"
 
-#: ../src/common/connection_handlers.py:927
-#: ../src/common/connection_handlers.py:1848
-#: ../src/common/connection_handlers.py:1894
-#: ../src/common/connection_handlers.py:2082
-#: ../src/common/connection_handlers.py:2215
-#: ../src/common/connection.py:1258
-#: ../src/gajim.py:400
+#: ../src/common/connection_handlers.py:677
+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:678
+#, fuzzy, python-format
+msgid "Registration with agent %s succeeded"
+msgstr "Registrierung mit Transport %s war erfolgreich"
+
+#: ../src/common/connection_handlers.py:680
+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:680
+#, fuzzy, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+"Registrierung mit Transport %(agent)s ist mit Fehler %(error)s "
+"fehlgeschlagen: %(error_msg)s"
+
+#: ../src/common/connection_handlers.py:968
+#: ../src/common/connection_handlers.py:1962
+#: ../src/common/connection_handlers.py:2008
+#: ../src/common/connection_handlers.py:2196
+#: ../src/common/connection_handlers.py:2329 ../src/common/connection.py:1342
+#: ../src/gajim.py:378
 msgid "Disk Write Error"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/common/connection_handlers.py:1134
-#: ../src/common/connection.py:880
+#: ../src/common/connection_handlers.py:1175 ../src/common/connection.py:917
 msgid "Invisibility not supported"
 msgstr "Unsichtbarkeit wird nicht unterstützt"
 
-#: ../src/common/connection_handlers.py:1135
-#: ../src/common/connection.py:881
+#: ../src/common/connection_handlers.py:1176 ../src/common/connection.py:918
 #, python-format
 msgid "Account %s doesn't support invisibility."
-msgstr "Konto %s unterstützt keine Unsichtbarkeit."
+msgstr "Das Konto %s unterstützt keine Unsichtbarkeit."
 
-#: ../src/common/connection_handlers.py:1689
-#: ../src/common/connection.py:1115
-#: ../src/config.py:1873
-#: ../src/config.py:1881
-#: ../src/config.py:1924
-#: ../src/config.py:3139
-#: ../src/dataforms_widget.py:536
-#: ../src/dialogs.py:2358
+#: ../src/common/connection_handlers.py:1790 ../src/common/connection.py:1157
+#: ../src/config.py:1835 ../src/config.py:1843 ../src/config.py:1886
+#: ../src/config.py:3111 ../src/dataforms_widget.py:536 ../src/dialogs.py:2362
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/common/connection_handlers.py:1690
+#: ../src/common/connection_handlers.py:1791
 msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "Eine Nachricht von einer ungültigen JID ist angekommen. Sie wurde ignoriert."
+msgstr ""
+"Es wurde eine Nachricht von einer ungültigen Jabber-ID empfangen. Die "
+"Nachricht wurde ignoriert."
 
-#: ../src/common/connection_handlers.py:1851
-#: ../src/common/connection_handlers.py:1897
-#: ../src/common/connection_handlers.py:2085
-#: ../src/common/connection_handlers.py:2218
-#: ../src/common/connection.py:1261
-#: ../src/gajim.py:179
+#: ../src/common/connection_handlers.py:1965
+#: ../src/common/connection_handlers.py:2011
+#: ../src/common/connection_handlers.py:2199
+#: ../src/common/connection_handlers.py:2332 ../src/common/connection.py:1345
+#: ../src/gajim.py:159
 #, 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 "Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie diese zu reparieren (siehe http://trac.gajim.org/wiki/DatabaseBackup) oder zu löschen (dabei werden alle Verläufe verloren gehen)."
+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 ""
+"Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu "
+"reparieren (http://trac.gajim.org/wiki/DatabaseBackup (Englisch)) oder zu "
+"löschen (dabei gehen alle Verläufe verloren)."
 
-#: ../src/common/connection_handlers.py:1969
+#: ../src/common/connection_handlers.py:2083
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Spitzname nicht erlaubt: %s"
@@ -3848,149 +4370,156 @@
 #. we are banned
 #. group chat does not exist
 #. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2044
-#: ../src/common/connection_handlers.py:2047
-#: ../src/common/connection_handlers.py:2050
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2057
-#: ../src/gajim.py:563
+#: ../src/common/connection_handlers.py:2158
+#: ../src/common/connection_handlers.py:2161
+#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2167
+#: ../src/common/connection_handlers.py:2171 ../src/gajim.py:531
 msgid "Unable to join group chat"
-msgstr "Fehler beim Betreten des Gruppenchats"
+msgstr "Fehler beim Betreten des Chatraums"
 
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:2159
 #, python-format
 msgid "You are banned from group chat %s."
-msgstr "Sie sind von Gruppenchat %s gebannt."
+msgstr "Sie wurden aus dem Chatraum %s verbannt."
 
-#: ../src/common/connection_handlers.py:2048
+#: ../src/common/connection_handlers.py:2162
 #, python-format
 msgid "Group chat %s does not exist."
-msgstr "Der Gruppenchat %s existiert nicht."
+msgstr "Der Chatraum %s existiert nicht."
 
-#: ../src/common/connection_handlers.py:2051
+#: ../src/common/connection_handlers.py:2165
 msgid "Group chat creation is restricted."
-msgstr "Gruppenchaterstellung ist beschränkt."
+msgstr "Die Chatraumerstellung ist eingeschränkt."
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
-msgstr "Sie müssen Ihren registrierten Spitznamen im Gruppenchat %s verwenden."
+msgstr ""
+"Sie müssen Ihren registrierten Spitznamen in diesem Chatraum %s verwenden."
 
-#: ../src/common/connection_handlers.py:2058
+#: ../src/common/connection_handlers.py:2172
 #, python-format
 msgid "You are not in the members list in groupchat %s."
-msgstr "Sie sind nicht in der Mitgliedliste des Gruppenchats %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:2100
+#: ../src/common/connection_handlers.py:2214
 msgid "Room has been destroyed"
-msgstr "Raum wurde zerstört"
+msgstr "Der Chatraum wurde gelöscht"
 
-#: ../src/common/connection_handlers.py:2107
+#: ../src/common/connection_handlers.py:2221
 #, python-format
 msgid "You can join this room instead: %s"
-msgstr "Sie können stattdessen diesem Raum beitreten: %s"
+msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
 
-#: ../src/common/connection_handlers.py:2134
+#: ../src/common/connection_handlers.py:2248
 msgid "I would like to add you to my roster."
-msgstr "Ich würde dich gerne zu meiner Liste hinzufügen."
+msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2155
+#: ../src/common/connection_handlers.py:2269
 #, python-format
 msgid "we are now subscribed to %s"
-msgstr "wir haben jetzt %s abonniert"
+msgstr "Sie haben jetzt %s abonniert"
 
-#: ../src/common/connection_handlers.py:2157
+#: ../src/common/connection_handlers.py:2271
 #, python-format
 msgid "unsubscribe request from %s"
-msgstr "Anfrage zur Kündigung des Abonnements von %s"
+msgstr "Anfrage zur Beendigung des Abonnements von %s"
 
-#: ../src/common/connection_handlers.py:2159
+#: ../src/common/connection_handlers.py:2273
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection_handlers.py:2341
+#: ../src/common/connection_handlers.py:2456
 #, python-format
-msgid "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"
-msgstr "Jid %s ist nicht RFC-konform. Sie wird nicht zu ihrer Kontaktliste hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool wie <http://jru.jabberstudio.org/>, um ihn zu entfernen"
+msgid ""
+"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"
+msgstr ""
+"Die Jabber-ID %s ist nicht RFC-konform und wird nicht zu Ihrer Kontaktliste "
+"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:2366
-#: ../src/common/zeroconf/connection_zeroconf.py:173
+#: ../src/common/connection_handlers.py:2481
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
-msgstr "Keine OpenPGP-Passphrase gewählt"
+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:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1920
-#: ../src/roster_window.py:1940
+#: ../src/common/connection_handlers.py:2483
+#: ../src/common/zeroconf/connection_zeroconf.py:177
+#: ../src/roster_window.py:1930
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
-msgstr "Sie werden ohne OpenPGP mit %s verbunden."
+msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
 
 #: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
-msgstr "Kann Zertifikat des Ausstellers nicht holen"
+msgstr "Das Zertifikat des Ausstellers ist nicht verfügbar."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
-msgstr "Kann Zertifikats CRL nicht holen"
+msgstr "Die Zertifikats-CRL ist nicht verfügbar."
 
 #: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
-msgstr "Kann Zertifikatsunterschrift nicht entschlüsseln"
+msgstr "Die Zertifikatsunterschrift konnte nicht entschlüsselt werden."
 
 #: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
-msgstr "Kann CRLs Unterschrift nicht entschlüsseln"
+msgstr "Die CRL-Unterschrift konnte nicht entschlüsselt werden."
 
 #: ../src/common/connection.py:71
 msgid "Unable to decode issuer public key"
-msgstr "Kann öffentlichen Schlüssel nicht entschlüsseln"
+msgstr "Der öffentliche Schlüssel konnte nicht entschlüsselt werden."
 
 #: ../src/common/connection.py:72
 msgid "Certificate signature failure"
-msgstr "Zertifikat-Unterschrift-Fehler"
+msgstr "Fehler bei der Zertifikat-Unterschrift"
 
 #: ../src/common/connection.py:73
 msgid "CRL signature failure"
-msgstr "CRL-Unterschrift-Fehler"
+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
 msgid "Certificate is not yet valid"
-msgstr "Zertifikat ist noch nicht gültig"
+msgstr "Das Zertifikat ist noch nicht gültig."
 
 #: ../src/common/connection.py:75
 msgid "Certificate has expired"
-msgstr "Zertifikat ist abgelaufen"
+msgstr "Das Zertifikat ist abgelaufen."
 
 #: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
-msgstr "CRL ist nocht nicht gültig"
+msgstr "Die CRL ist nocht nicht gültig."
 
 #: ../src/common/connection.py:77
 msgid "CRL has expired"
-msgstr "CRL ist abgelaufen"
+msgstr "Die CRL ist abgelaufen."
 
 #: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
-msgstr "Formatfehler im notBefore Feld des Zertifikats"
+msgstr "Formatfehler im \"notBefore\"-Feld des Zertifikats"
 
 #: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
-msgstr "Formatfehler im notAfter Feld des Zertifikats"
+msgstr "Formatfehler im \"notAfter\"-Feld des Zertifikats"
 
 #: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
-msgstr "Formatfehler im lastUpdate Feld des CRLs"
+msgstr "Formatfehler im \"lastUpdate\"-Feld der CRL"
 
 #: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
-msgstr "Formatfehler in nextUpdate Feld des CRLs"
+msgstr "Formatfehler im \"nextUpdate\"-Feld der CRL"
 
 #: ../src/common/connection.py:82
 msgid "Out of memory"
@@ -4006,11 +4535,11 @@
 
 #: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
-msgstr "Kann lokales Herausgeberzertifikat nicht holen"
+msgstr "Das lokale Herausgeberzertifikat ist nicht verfügbar."
 
 #: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
-msgstr "Kann erstes Zertifikat nicht prüfen"
+msgstr "Das erste Zertifikat konnte nicht überprüft werden."
 
 #: ../src/common/connection.py:87
 msgid "Certificate chain too long"
@@ -4018,11 +4547,11 @@
 
 #: ../src/common/connection.py:88
 msgid "Certificate revoked"
-msgstr "Zertifikat widerrufen"
+msgstr "Zertifikat wurde widerrufen"
 
 #: ../src/common/connection.py:89
 msgid "Invalid CA certificate"
-msgstr "Ungültiges CA Zertifikat"
+msgstr "Ungültiges CA-Zertifikat"
 
 #: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
@@ -4030,7 +4559,7 @@
 
 #: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
-msgstr "Nicht unterstütztes Zertifikatsverwendungszweck"
+msgstr "Nicht unterstützter Zertifikatsverwendungszweck"
 
 #: ../src/common/connection.py:92
 msgid "Certificate not trusted"
@@ -4042,94 +4571,104 @@
 
 #: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
-msgstr "Subject issuer mismatch"
+msgstr "Betreffs-Aussteller unpassend"
 
 #: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
-msgstr "Authority and subject key identifier mismatch"
+msgstr "Zertifizierungsstelle und Betreffsschlüssel unpassend"
 
 #: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
-msgstr "Authority and issuer serial number mismatch"
+msgstr "Zertifizierungsstelle und Aussteller-Seriennummer unpassend"
 
 #: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
-msgstr "Verwendung des Schlüssels beinhaltet kein Unterschreiben des Zertifikats"
+msgstr ""
+"Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des "
+"Zertifikats."
 
 #: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen der Anwendung"
 
-#: ../src/common/connection.py:267
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:271
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:272
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:283
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr "Server %(name)s beantwortete Registrierungsanfrage nicht korrekt: %(error)s"
+msgstr ""
+"Der Server %(name)s beantwortete die Registrierungsanfrage nicht korrekt: %"
+"(error)s"
 
-#: ../src/common/connection.py:313
+#: ../src/common/connection.py:317
 #, python-format
 msgid "Server %s provided a different registration form"
-msgstr "Server %s bot ein anderes Registrierungsformular"
+msgstr "Der Server %s hat ein anderes Registrierungsformular angeboten"
 
-#: ../src/common/connection.py:326
+#: ../src/common/connection.py:330
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:345
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:342
+#: ../src/common/connection.py:346
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr "Transport %(name)s beantwortete Registrierungsanfrage nicht korrekt: %(error)s"
+msgstr ""
+"Der Transport %(name)s beantwortete die Registrierungsanfrage nicht korrekt: "
+"%(error)s"
 
-#: ../src/common/connection.py:629
-#: ../src/common/connection.py:743
-#: ../src/common/connection.py:1393
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:629 ../src/common/connection.py:755
+#: ../src/common/connection.py:1478
+#: ../src/common/zeroconf/connection_zeroconf.py:251
 #, python-format
 msgid "Could not connect to \"%s\""
-msgstr "Konnte nicht mit %s verbinden"
+msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:630
-#: ../src/gajim.py:1057
+#: ../src/common/connection.py:630 ../src/gajim.py:1083
 msgid "Check your connection or try again later."
-msgstr "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
+msgstr ""
+"Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
 
-#: ../src/common/connection.py:639
+#: ../src/common/connection.py:635
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Absender: %s"
+
+#: ../src/common/connection.py:648
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../src/common/connection.py:670
-#: ../src/common/connection.py:723
+#: ../src/common/connection.py:679 ../src/common/connection.py:735
 #, python-format
 msgid "Could not connect to account %s"
-msgstr "Konnte nicht mit %s verbinden"
+msgstr "Die Verbindung zum Konto %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:671
-#: ../src/common/connection.py:724
+#: ../src/common/connection.py:680 ../src/common/connection.py:736
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
-msgstr "Verbindung mit Konto \"%s\" wurde unterbrochen. Verbindung wird wiederhergestellt."
+msgstr ""
+"Die Verbindung zum Konto \"%s\" wurde unterbrochen. Sie wird "
+"wiederhergestellt."
 
-#: ../src/common/connection.py:693
+#: ../src/common/connection.py:702
 #, 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:696
+#: ../src/common/connection.py:705
 #, python-format
 msgid ""
 "\n"
@@ -4138,7 +4677,7 @@
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: ../src/common/connection.py:698
+#: ../src/common/connection.py:707
 #, python-format
 msgid ""
 "\n"
@@ -4147,53 +4686,62 @@
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: ../src/common/connection.py:744
+#: ../src/common/connection.py:756
 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:769
+#: ../src/common/connection.py:781
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:771
+#: ../src/common/connection.py:783
 msgid "Please check your login and password for correctness."
-msgstr "Bitte überprüfen Sie ihren Benutzernamen und Passwort."
+msgstr "Bitte überprüfen Sie Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:832
+#: ../src/common/connection.py:844
 msgid "Error while removing privacy list"
-msgstr "Fehler beim Entfernen der Privatliste"
+msgstr "Fehler beim Entfernen der Privatsphären-Liste"
 
-#: ../src/common/connection.py:833
+#: ../src/common/connection.py:845
 #, 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 "Privatliste %s wurde nicht entfernt. Möglicherweise ist die Privatliste noch in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie es erneut."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Die Privatsphären-Liste %s wurde nicht entfernt. Möglicherweise ist sie noch "
+"in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
+"es erneut."
 
-#: ../src/common/connection.py:1116
-#: ../src/dialogs.py:2359
+#: ../src/common/connection.py:1158 ../src/dialogs.py:2363
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "Es ist nicht möglich eine Nachricht an %s zu senden. Diese JID ist ungültig."
+msgstr ""
+"Die Nachricht kann nicht an %s gesendet werden. Die Jabber-ID ist ungültig."
 
-#: ../src/common/connection.py:1137
-#: ../src/common/zeroconf/connection_zeroconf.py:389
+#: ../src/common/connection.py:1180
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr "Weder die entfernte Präsenz ist signiert, noch wurde ein Schlüssel zugewiesen."
+msgstr ""
+"Weder ist die entfernte Präsenz signiert, noch wurde ein Schlüssel "
+"zugewiesen."
 
-#: ../src/common/connection.py:1139
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1182
+#: ../src/common/zeroconf/connection_zeroconf.py:393
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr "Der Kontaktschlüssel (%s) stimmt nicht mit dem in Gajim zugewiesenen Schlüssel überein."
+msgstr ""
+"Der Kontaktschlüssel (%s) stimmt nicht mit dem in Gajim zugewiesenen "
+"Schlüssel überein."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1148
+#: ../src/common/connection.py:1230
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
 
-#: ../src/common/connection.py:1248
-#: ../src/common/zeroconf/connection_zeroconf.py:468
+#: ../src/common/connection.py:1332
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4202,65 +4750,62 @@
 "Thema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1426
+#: ../src/common/connection.py:1511 ../src/common/connection.py:1532
 msgid "Not fetched because of invisible status"
-msgstr "Nicht abgeholt aufgrund eines Unsichtbar-Status"
+msgstr "Nicht abgeholt, da der Status auf Unsichtbar gesetzt ist"
 
-#: ../src/common/contacts.py:92
-#: ../src/common/helpers.py:72
-#: ../src/gajim.py:980
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:56
+#: ../src/gajim.py:988
 msgid "Observers"
 msgstr "Beobachter"
 
-#: ../src/common/contacts.py:96
-#: ../src/common/contacts.py:348
-#: ../src/common/helpers.py:72
-#: ../src/disco.py:117
-#: ../src/disco.py:118
-#: ../src/disco.py:1349
-#: ../src/gajim.py:809
-#: ../src/roster_window.py:815
-#: ../src/roster_window.py:1466
-#: ../src/roster_window.py:1533
-#: ../src/roster_window.py:1535
-#: ../src/roster_window.py:1672
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:56 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1350 ../src/gajim.py:801 ../src/roster_window.py:814
+#: ../src/roster_window.py:1468 ../src/roster_window.py:1537
+#: ../src/roster_window.py:1539 ../src/roster_window.py:1683
 msgid "Transports"
-msgstr "Transports"
+msgstr "Transporte"
 
 #: ../src/common/contacts.py:356
 msgid "Not in roster"
 msgstr "Nicht in der Kontaktliste"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:49
 msgid "D-Bus python bindings are missing in this computer"
-msgstr "Auf diesem Computer fehlen die Python Bibliotheken für D-Bus"
+msgstr "Auf diesem Computer fehlen die Python-Bibliotheken für D-Bus."
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:50
 msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "Gajims D-BUS-Möglichkeiten können nicht genutzt werden"
+msgstr "Die D-Bus-Fähigkeiten können nicht genutzt werden."
 
 #: ../src/common/exceptions.py:30
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (auch python-pysqlite2 genannt) Abhängigkeit fehlt. Abbruch..."
+msgstr "pysqlite2 (auch python-pysqlite2 genannt) fehlt. Abbruch …"
 
 #: ../src/common/exceptions.py:47
 msgid "Database cannot be read."
-msgstr "Datenbank kann nicht gelesen werden."
+msgstr "Die Datenbank kann nicht gelesen werden."
 
 #: ../src/common/exceptions.py:55
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Dienst nicht verfügbar: Gajim ist nicht aktiv oder remote_control ist deaktiviert"
+msgstr ""
+"Dienst nicht verfügbar: Gajim ist nicht aktiv oder remote_control ist "
+"deaktiviert."
 
 #: ../src/common/exceptions.py:63
 msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-Bus auf diesem Computer nicht vorhanden oder das Python-Modul fehlt"
+msgstr ""
+"D-Bus ist auf diesem Computer nicht vorhanden oder das Python-Modul fehlt."
 
 #: ../src/common/exceptions.py:71
 msgid ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr "Sitzungsbus ist nicht verfügbar.\"Bitte lesen Sie http://trac.gajim.org/wiki/GajimDBus (Englisch)"
+msgstr ""
+"Sitzungsbus ist nicht verfügbar.\n"
+"Bitte lesen Sie http://trac.gajim.org/wiki/GajimDBus (Englisch)"
 
 #: ../src/common/fuzzyclock.py:42
 msgid "one"
@@ -4312,74 +4857,61 @@
 
 #. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
 #. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "$0 o'clock"
 msgstr "%0 Uhr"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "five past $0"
 msgstr "fünf nach %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 msgid "ten past $0"
 msgstr "zehn nach %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 msgid "quarter past $0"
 msgstr "viertel nach %0"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
 msgid "twenty past $0"
 msgstr "zwanzig nach %0"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
 msgid "twenty five past $0"
 msgstr "fünfundzwanzig nach %0"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
 msgid "half past $0"
 msgstr "dreißig nach %0"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
 msgid "twenty five to $1"
 msgstr "fünfundzwanzig vor %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 msgid "twenty to $1"
 msgstr "zwanzig vor %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 msgid "quarter to $1"
 msgstr "viertel vor %1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "ten to $1"
 msgstr "zehn vor %1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "five to $1"
 msgstr "fünf vor %1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:61
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
 msgid "$1 o'clock"
 msgstr "%1 Uhr"
 
 #: ../src/common/fuzzyclock.py:64
 msgid "Night"
-msgstr "Nacht"
+msgstr "Nachts"
 
 #: ../src/common/fuzzyclock.py:64
 msgid "Early morning"
@@ -4387,27 +4919,27 @@
 
 #: ../src/common/fuzzyclock.py:64
 msgid "Morning"
-msgstr "Morgen"
+msgstr "Morgens"
 
 #: ../src/common/fuzzyclock.py:64
 msgid "Almost noon"
-msgstr "Fast Mittag"
+msgstr "Fast Mittags"
 
 #: ../src/common/fuzzyclock.py:65
 msgid "Noon"
-msgstr "Mittag"
+msgstr "Mittags"
 
 #: ../src/common/fuzzyclock.py:65
 msgid "Afternoon"
-msgstr "Nachmittag"
+msgstr "Nachmittags"
 
 #: ../src/common/fuzzyclock.py:65
 msgid "Evening"
-msgstr "Abend"
+msgstr "Abends"
 
 #: ../src/common/fuzzyclock.py:65
 msgid "Late evening"
-msgstr "Später Abend"
+msgstr "Spät Abends"
 
 #: ../src/common/fuzzyclock.py:67
 msgid "Start of week"
@@ -4425,239 +4957,235 @@
 msgid "Weekend!"
 msgstr "Wochenende!"
 
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:141
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen"
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:146
 msgid "Server address required."
-msgstr "Server-Adresse notwendig."
+msgstr "Server-Adresse benötigt."
 
-#: ../src/common/helpers.py:168
+#: ../src/common/helpers.py:152
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen im Rechnernamen."
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:159
 msgid "Invalid character in resource."
-msgstr "Ungültiges Zeichen in Resource."
+msgstr "Ungültiges Zeichen in der Ressource."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:215
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:218
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:222
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:225
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:229
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:232
-#, python-format
-msgid "%s KB"
-msgstr "%s kB"
-
-#. B means bytes
-#: ../src/common/helpers.py:235
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Angemeldet"
 
-#: ../src/common/helpers.py:283
-#: ../src/features_window.py:119
+#: ../src/common/helpers.py:208 ../src/features_window.py:115
 msgid "Available"
-msgstr "Angemeldet"
+msgstr "Verfügbar"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:210
 msgid "Connecting"
-msgstr "Verbinde"
+msgstr "Verbindung wird hergestellt"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "?Kontakt hat Status: Unbekannt"
 
-#: ../src/common/helpers.py:306
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
-msgstr "?Kontakt hat Status: Hat Fehler"
+msgstr "?Kontakt hat Status: Hat einen Fehler"
 
-#: ../src/common/helpers.py:311
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
-msgstr "?Abonnement schon vorhanden: Keines"
+msgstr "?Abonnement schon vorhanden:Keines"
 
-#: ../src/common/helpers.py:313
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "?Frage nach Abonnement: Keine"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppenchat Kontaktrolle: Keine"
 
-#: ../src/common/helpers.py:339
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:282
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppenchat Kontaktverbindung:Keine"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:284
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../src/common/helpers.py:361
+#: ../src/common/helpers.py:286
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:363
+#: ../src/common/helpers.py:288
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../src/common/helpers.py:400
+#: ../src/common/helpers.py:325
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:402
+#: ../src/common/helpers.py:327
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:404
+#: ../src/common/helpers.py:329
 msgid "is composing a message..."
-msgstr "schreibt im Moment ..."
+msgstr "schreibt im Moment …"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:407
+#: ../src/common/helpers.py:332
 msgid "paused composing a message"
 msgstr "macht gerade eine Schreibpause"
 
-#: ../src/common/helpers.py:409
+#: ../src/common/helpers.py:334
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
-#: ../src/common/helpers.py:983
-#: ../src/common/helpers.py:990
+#. GiB means gibibyte
+#: ../src/common/helpers.py:662
 #, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:665
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:669
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:672
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:676
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:679
+#, python-format
+msgid "%s KB"
+msgstr "%s kB"
+
+#. B means bytes
+#: ../src/common/helpers.py:682
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1092 ../src/common/helpers.py:1099
+#, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
-msgstr[0] "%d Nachricht schwebend"
-msgstr[1] "%d Nachrichten schwebend"
+msgstr[0] "%d neue Nachricht"
+msgstr[1] "%d neue Nachrichten"
 
-#: ../src/common/helpers.py:996
+#: ../src/common/helpers.py:1105
 #, python-format
 msgid " from room %s"
-msgstr "Von Gruppenchat %s"
+msgstr "Vom Chatraum %s"
 
-#: ../src/common/helpers.py:999
-#: ../src/common/helpers.py:1018
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1127
 #, python-format
 msgid " from user %s"
-msgstr "Von Benutzer %s"
+msgstr "Vom Benutzer %s"
 
-#: ../src/common/helpers.py:1001
+#: ../src/common/helpers.py:1110
 #, python-format
 msgid " from %s"
 msgstr "Von %s"
 
-#: ../src/common/helpers.py:1008
-#: ../src/common/helpers.py:1015
+#: ../src/common/helpers.py:1117 ../src/common/helpers.py:1124
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
-msgstr[0] "%d Ereignis anstehend"
-msgstr[1] "%d Ereignisse anstehend"
+msgstr[0] "%d neues Ereignis"
+msgstr[1] "%d neue Ereignisse"
 
-#: ../src/common/helpers.py:1048
+#: ../src/common/helpers.py:1157
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -4668,19 +5196,18 @@
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
-#: ../src/common/optparser.py:226
-#: ../src/common/optparser.py:227
+#: ../src/common/optparser.py:230 ../src/common/optparser.py:231
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:343
+#: ../src/common/optparser.py:347
 msgid "migrating logs database to indices"
-msgstr "migriere Logdatenbank zu Indices"
+msgstr "migriere Logdatenbank zu Indizes"
 
-#: ../src/common/passwords.py:92
+#: ../src/common/passwords.py:117
 #, python-format
-msgid "Gajim account %s"
-msgstr "Gajim-Konto %s"
+msgid "XMPP account %s@%s"
+msgstr "XMPP-Konto %s@%s"
 
 #: ../src/common/pep.py:29
 msgid "Afraid"
@@ -4812,7 +5339,7 @@
 
 #: ../src/common/pep.py:61
 msgid "Grateful"
-msgstr "Erkenntlich"
+msgstr "Dankbar"
 
 #: ../src/common/pep.py:62
 msgid "Grieving"
@@ -4900,7 +5427,7 @@
 
 #: ../src/common/pep.py:83
 msgid "Mean"
-msgstr "Fies"
+msgstr "Gemein"
 
 #: ../src/common/pep.py:84
 msgid "Moody"
@@ -5020,7 +5547,7 @@
 
 #: ../src/common/pep.py:115
 msgid "Doing Chores"
-msgstr "Haushalt machen"
+msgstr "Haushalt erledigen"
 
 #: ../src/common/pep.py:116
 msgid "Buying Groceries"
@@ -5094,8 +5621,7 @@
 msgid "Exercising"
 msgstr "Sport machen"
 
-#: ../src/common/pep.py:135
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
 msgid "Cycling"
 msgstr "Rad fahren"
 
@@ -5173,7 +5699,7 @@
 
 #: ../src/common/pep.py:155
 msgid "Hiding"
-msgstr "Untertauchen"
+msgstr "Verstecken"
 
 #: ../src/common/pep.py:156
 msgid "On Vacation"
@@ -5315,31 +5841,43 @@
 #: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
-msgstr "Konnte nicht an Port %s binden."
+msgstr "Port %s konnte nicht belegt werden (Bindung fehlgeschlagen)."
 
 #: ../src/common/socks5.py:87
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
 msgstr "Möglicherweise läuft Gajim bereits. Dateiübertragung wird abgebrochen."
 
 #. we're not english
-#: ../src/common/stanza_session.py:279
-msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
-msgstr "[Dies ist ein Teil einer verschlüsselten Unterhaltung. Wenn Sie diese Nachricht sehen, ist etwas schief gegangen.]"
+#: ../src/common/stanza_session.py:281
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+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
 #, python-format
-msgid "The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored."
-msgstr "Der Server %s, den Sie für die erweiterte Option ft_override_host_to_send angeben haben, ist ungültig und wird ignoriert."
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+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:216
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 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."
+msgstr ""
+"Um weiterhin Nachrichten senden und empfangen zu können, müssen Sie sich "
+"erneut verbinden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahi-Fehler"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5348,51 +5886,58 @@
 "%s\n"
 "Lokaler Nachrichtenversand funktioniert eventuell nicht richtig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
-msgstr "Bitte überprüfen Sie, ob Avahi oder Bonjour installiert ist."
+msgstr "Bitte überprüfen Sie, ob Avahi bzw. Bonjour installiert ist."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Lokaler Dienst konnte nicht gestartet werden"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
-msgstr "Konnte nicht mit Port %d verbinden."
+msgstr "Die Verbindung mit Port %d ist fehlgeschlagen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Bitte überprüfen Sie, ob avahi-daemon läuft."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, 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:381
-msgid "You are not connected or not visible to others. Your message could not be sent."
-msgstr "Sie sind nicht verbunden oder für andere nicht sichtbar. Ihre Nachricht konnte nicht versendet werden."
+#: ../src/common/zeroconf/connection_zeroconf.py:383
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Sie sind nicht verbunden oder für andere nicht sichtbar. Ihre Nachricht "
+"konnte nicht versendet werden."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:480
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Die Nachricht konnte nicht gesendet werden."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:486
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
-msgstr "Kontakt ist offline. Ihre Nachricht konnte nicht versendet werden."
+msgstr "Der Kontakt ist offline. Ihre Nachricht konnte nicht gesendet werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:585
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Verbindung zum Server konnte nicht hergestellt werden: Zeitüberschreitung beim Senden von Daten."
+#: ../src/common/zeroconf/connection_zeroconf.py:588
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Die Verbindung zum Server konnte nicht hergestellt werden: "
+"Zeitüberschreitung beim Senden von Daten."
 
 #: ../src/common/zeroconf/zeroconf_avahi.py:183
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
@@ -5400,294 +5945,256 @@
 msgid "Error while adding service. %s"
 msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 
-#: ../src/config.py:150
-#: ../src/config.py:579
+#: ../src/config.py:151 ../src/config.py:605
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../src/config.py:318
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../src/config.py:326
-msgid "Event"
-msgstr "Ereignis"
-
-#: ../src/config.py:402
+#: ../src/config.py:392
 msgid "Default Message"
-msgstr "Standard-Nachrichten"
+msgstr "Standard-Nachricht"
 
-#: ../src/config.py:409
+#: ../src/config.py:399
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../src/config.py:451
+#: ../src/config.py:441
 msgid "Always use OS/X default applications"
-msgstr "OS/X Standardprogramme immer verwenden"
+msgstr "Immer OS/X-Standardprogramme verwenden"
 
-#: ../src/config.py:452
+#: ../src/config.py:442
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../src/config.py:645
-#: ../src/dialogs.py:1199
+#: ../src/config.py:671 ../src/dialogs.py:1201
 #, python-format
 msgid "Dictionary for lang %s not available"
-msgstr "Wörterburch für Sprache %s nicht verfügbar"
+msgstr "Kein Wörterburch für die Sprache %s verfügbar"
 
-#: ../src/config.py:646
+#: ../src/config.py:672
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, um die Rechtschreibprüfung zu nutzen."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+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:1011
+#: ../src/config.py:1049
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:1011
+#: ../src/config.py:1049
 msgid "status message text"
 msgstr "Statusnachricht"
 
-#: ../src/config.py:1047
-msgid "First Message Received"
-msgstr "Erste empfangene Nachricht"
-
-#: ../src/config.py:1048
-msgid "Next Message Received Focused"
-msgstr "Nächste empfangene Nachricht fixiert"
-
-#: ../src/config.py:1050
-msgid "Next Message Received Unfocused"
-msgstr "Nächste empfangene Nachricht nicht fixiert"
-
-#: ../src/config.py:1051
-msgid "Contact Connected"
-msgstr "Kontakt verbunden"
-
-#: ../src/config.py:1052
-msgid "Contact Disconnected"
-msgstr "Kontakt nicht verbunden"
-
-#: ../src/config.py:1053
-msgid "Message Sent"
-msgstr "Nachricht gesendet"
-
-#: ../src/config.py:1054
-msgid "Group Chat Message Highlight"
-msgstr "Gruppenchat-Nachrichten-Hervorhebung"
-
-#: ../src/config.py:1055
-msgid "Group Chat Message Received"
-msgstr "Gruppenchat-Nachricht empfangen"
-
-#: ../src/config.py:1056
-msgid "GMail Email Received"
-msgstr "E-Mail über Google Mail empfangen"
-
 #. Name column
-#: ../src/config.py:1373
-#: ../src/dialogs.py:1823
-#: ../src/dialogs.py:1887
-#: ../src/disco.py:770
-#: ../src/disco.py:1562
-#: ../src/disco.py:1808
+#: ../src/config.py:1329 ../src/dialogs.py:1828 ../src/dialogs.py:1892
+#: ../src/disco.py:771 ../src/disco.py:1563 ../src/disco.py:1809
 #: ../src/history_window.py:87
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1459
+#: ../src/config.py:1415
 msgid "Relogin now?"
-msgstr "Jetzt neu einloggen?"
+msgstr "Jetzt erneut anmelden?"
 
-#: ../src/config.py:1460
+#: ../src/config.py:1416
 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 neu einloggen."
+msgstr ""
+"Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich erneut "
+"anmelden."
 
-#: ../src/config.py:1585
-#: ../src/config.py:1684
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/config.py:1544 ../src/config.py:1645
 msgid "OpenPGP is not usable on this computer"
-msgstr "OpenPGP kann auf diesem Computer nicht benutzt werden"
+msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden."
 
-#: ../src/config.py:1720
-#: ../src/config.py:1763
+#: ../src/config.py:1681 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1682
 msgid "Read all pending events before removing this account."
-msgstr "Alle ungelesenen Ereignisse lesen, bevor der Account entfernt wird."
+msgstr "Alle ungelesenen Ereignisse anzeigen, bevor das Konto entfernt wird."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1708
 #, python-format
 msgid "You have opened chat in account %s"
-msgstr "Sie haben mit Account %s einen Chat geöffnet"
+msgstr "Sie haben mit dem Konto %s einen Chat geöffnet."
 
-#: ../src/config.py:1748
+#: ../src/config.py:1709
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
 
-#: ../src/config.py:1759
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
-msgstr "Sie sind mit dem Server verbunden"
+msgstr "Sie sind mit dem Server verbunden."
 
-#: ../src/config.py:1760
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
-msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
+msgstr ""
+"Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
 
-#: ../src/config.py:1764
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
-msgstr "Um Kontonamen zu ändern, müssen Sie alle neunen Ereignisse lesen."
+msgstr ""
+"Damit der Kontoname geändert werden kann, müssen Sie zuvor alle neuen "
+"Ereignisse lesen."
 
-#: ../src/config.py:1770
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
-msgstr "Kontoname wird bereits verwendet"
+msgstr "Der Kontoname wird bereits verwendet."
 
-#: ../src/config.py:1771
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Dieser Name wird bereits für einen anderen Ihrer Accounts verwendet. Bitte wählenSie einen anderen Namen."
+#: ../src/config.py:1732
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Dieser Name wird bereits für eines Ihrer Konten verwendet. Bitte wählen Sie "
+"einen anderen Namen."
 
-#: ../src/config.py:1775
-#: ../src/config.py:1779
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1776
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
-msgstr "Kontoname darf nicht leer sein."
+msgstr "Der Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1780
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
-msgstr "Kontoname darf keine Leerzeichen enthalten."
+msgstr "Der Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1854
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Konto umbenennen"
 
-#: ../src/config.py:1855
+#: ../src/config.py:1817
 #, 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:1882
+#: ../src/config.py:1844
 msgid "A Jabber ID must be in the form \"user at servername\"."
-msgstr "Jabber-ID muss in der Form \"user at servername\" sein."
+msgstr "Die Jabber-ID muss in der Form \"benutzer at servername\" sein."
 
-#: ../src/config.py:2072
-#: ../src/config.py:3211
+#: ../src/config.py:2034 ../src/config.py:3171
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:2073
-#: ../src/config.py:3212
+#: ../src/config.py:2035 ../src/config.py:3172
 msgid "Custom port must be a port number."
-msgstr "Proxy Port muss eine Portnummer sein."
+msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
 
-#: ../src/config.py:2094
+#: ../src/config.py:2056
 msgid "Failed to get secret keys"
-msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
+msgstr "Die geheimen Schlüssel konnten nicht empfangen werden."
 
-#: ../src/config.py:2095
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/config.py:2057
 msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Es gab ein Problem beim Holen ihres geheimen OpenPGP-Schlüssels."
+msgstr "Es gab ein Problem beim Empfangen Ihres geheimen OpenPGP-Schlüssels."
 
-#: ../src/config.py:2130
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/config.py:2092
 msgid "OpenPGP Key Selection"
-msgstr "OpenPGP Schlüssel-Auswahl"
+msgstr "OpenPGP-Schlüssel-Auswahl"
 
-#: ../src/config.py:2131
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/config.py:2093
 msgid "Choose your OpenPGP key"
-msgstr "Wählen Sie Ihren OpenPGP Schlüssel"
+msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
 
-#: ../src/config.py:2138
+#: ../src/config.py:2100
 msgid "No such account available"
-msgstr "Solch ein Konto ist nicht verfügbar"
+msgstr "Das angegebene Konto ist nicht verfügbar"
 
-#: ../src/config.py:2139
+#: ../src/config.py:2101
 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"
+msgstr ""
+"Sie müssen ein Konto erstellen, bevor Sie die persönlichen Informationen "
+"ändern können."
 
-#: ../src/config.py:2146
-#: ../src/dialogs.py:1675
-#: ../src/dialogs.py:1811
-#: ../src/dialogs.py:1990
-#: ../src/disco.py:439
-#: ../src/profile_window.py:317
+#: ../src/config.py:2108 ../src/dialogs.py:1680 ../src/dialogs.py:1816
+#: ../src/dialogs.py:1995 ../src/disco.py:439 ../src/profile_window.py:317
 msgid "You are not connected to the server"
-msgstr "Sie sind nicht mit dem Server verbunden"
+msgstr "Sie sind nicht mit dem Server verbunden."
 
-#: ../src/config.py:2147
+#: ../src/config.py:2109
 msgid "Without a connection, you can not edit your personal information."
-msgstr "Sie müssen angemeldet sein, um Ihre persönlichen Informationen zu bearbeiten"
+msgstr ""
+"Sie müssen angemeldet sein, um Ihre persönlichen Informationen ändern zu "
+"können."
 
-#: ../src/config.py:2151
+#: ../src/config.py:2113
 msgid "Your server doesn't support Vcard"
-msgstr "Ihr Server unterstützt keine vCard"
+msgstr "Ihr Server unterstützt keine vCard."
 
-#: ../src/config.py:2152
+#: ../src/config.py:2114
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:2183
+#: ../src/config.py:2145
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden."
 
-#: ../src/config.py:2184
+#: ../src/config.py:2146
 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."
+msgstr ""
+"Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte "
+"aktivieren."
 
-#: ../src/config.py:2367
+#: ../src/config.py:2329
 #, python-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: ../src/config.py:2369
+#: ../src/config.py:2331
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the beginning
-#: ../src/config.py:2405
+#: ../src/config.py:2367
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2406
+#: ../src/config.py:2368
 msgid "Member List"
 msgstr "Mitgliederliste"
 
-#: ../src/config.py:2407
+#: ../src/config.py:2369
 msgid "Owner List"
 msgstr "Besitzerliste"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2370
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2457
-#: ../src/disco.py:777
-#: ../src/history_manager.py:184
+#: ../src/config.py:2419 ../src/disco.py:778 ../src/history_manager.py:183
 msgid "JID"
-msgstr "JID"
+msgstr "Jabber-ID"
 
-#: ../src/config.py:2465
+#: ../src/config.py:2429
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2470
+#: ../src/config.py:2436
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2442
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2499
+#: ../src/config.py:2469
 msgid "Banning..."
-msgstr "Verbannen ..."
+msgstr "Verbannen …"
 
 #. You can move '\n' before user at domain if that line is TOO BIG
-#: ../src/config.py:2501
+#: ../src/config.py:2471
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5695,11 +6202,11 @@
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2503
+#: ../src/config.py:2473
 msgid "Adding Member..."
-msgstr "Mitglied hinzufügen ..."
+msgstr "Mitglied hinzufügen …"
 
-#: ../src/config.py:2504
+#: ../src/config.py:2474
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5707,11 +6214,11 @@
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2506
+#: ../src/config.py:2476
 msgid "Adding Owner..."
-msgstr "Besitzer hinzufügen ..."
+msgstr "Besitzer hinzufügen …"
 
-#: ../src/config.py:2507
+#: ../src/config.py:2477
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5719,11 +6226,11 @@
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2509
+#: ../src/config.py:2479
 msgid "Adding Administrator..."
-msgstr "Füge Administrator hinzu ..."
+msgstr "Administrator hinzufügen …"
 
-#: ../src/config.py:2510
+#: ../src/config.py:2480
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5731,124 +6238,126 @@
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2511
+#: ../src/config.py:2481
+#, fuzzy
 msgid ""
 "Can be one of the following:\n"
 "1. user at domain/resource (only that resource matches).\n"
 "2. user at domain (any resource matches).\n"
 "3. domain/resource (only that resource matches).\n"
 "4. domain (the domain itself matches, as does any user at domain,\n"
-"domain/resource, or address containing a subdomain."
+"domain/resource, or address containing a subdomain)."
 msgstr ""
-"Kann eines der folgenden sein:\"1. benutzer at domain/resource (nur die Resource trifft zu).\n"
-"2. benutzer at domain (jede Resource trifft zu).\n"
-"3 domain (die Domain selbst trifft zu, als auch jeder benutzer at domain,\n"
-"jede domain/resource oder Adresse, die eine Subdomain enthält."
+"Mögliche Werte:\n"
+"1. benutzer at servername/Ressource (nur die angegebene Ressource trifft zu).\n"
+"2. benutzer at servername (jede Resource trifft zu).\n"
+"3. servername/Ressource (nur die angegebene Ressource trifft zu)\n"
+"4. servername (sowohl der Servername selbst trifft zu als auch jeder "
+"benutzer at servername, jeder servername/Ressource oder jede Adresse, die eine "
+"Subdomain enthält)."
 
-#: ../src/config.py:2608
+#: ../src/config.py:2578
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2630
-#: ../src/gajim.py:1429
-#: ../src/roster_window.py:1932
+#: ../src/config.py:2600 ../src/gajim.py:1472 ../src/gajim.py:1559
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2631
-#: ../src/roster_window.py:1906
+#. ('PASSWORD_REQUIRED', account, None)
+#: ../src/config.py:2601 ../src/gajim.py:1542
 #, python-format
 msgid "Enter your password for account %s"
-msgstr "Geben Sie ihr Passwort für %s ein"
+msgstr "Bitte geben Sie Ihr Passwort für %s ein"
 
-#: ../src/config.py:2632
-#: ../src/roster_window.py:1933
+#: ../src/config.py:2602 ../src/gajim.py:1559
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2641
+#: ../src/config.py:2611
 #, python-format
 msgid "Account \"%s\" is connected to the server"
-msgstr "Konto \"%s\" ist mit Server verbunden"
+msgstr "Das Konto \"%s\" ist mit dem Server verbunden"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2612
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2738
+#: ../src/config.py:2708
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2738
+#: ../src/config.py:2708
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2739
+#: ../src/config.py:2709
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:2740
+#: ../src/config.py:2710
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
 
-#: ../src/config.py:2808
+#: ../src/config.py:2778
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
-#: ../src/config.py:2841
+# TODO: make decisision about how to handle original string referring to a bookmarked groupchat.
+#: ../src/config.py:2811
 msgid "This bookmark has invalid data"
-msgstr "Dieses Lesezeichen hat ungültige Daten"
+msgstr "Dieser gespeicherte Chatraum beinhaltet ungültige Daten"
 
-#: ../src/config.py:2842
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Bitte Serverfeld und Raumfeld ausfüllen oder Lesezeichen löschen."
+#: ../src/config.py:2812
+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."
 
-#: ../src/config.py:3122
+#: ../src/config.py:3094
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3124
+#: ../src/config.py:3096
 msgid "You must provide a username to configure this account."
-msgstr "Sie müssen einen Benutzernamen angeben, um diesen Account zu konfigurieren."
+msgstr ""
+"Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
 
-#: ../src/config.py:3150
-msgid "Duplicate Jabber ID"
-msgstr "Doppelte Jabber-ID"
-
-#: ../src/config.py:3151
-msgid "This account is already configured in Gajim."
-msgstr "Dieser Kontakt wurde in Gajim bereits konfiguriert."
-
-#: ../src/config.py:3168
+#: ../src/config.py:3128
 msgid "Account has been added successfully"
-msgstr "Account wurde erfolgreich hinzugefügt"
+msgstr "Konto wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:3169
-#: ../src/config.py:3358
-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 window."
-msgstr "Sie können die erweiterten Kontooptionen durch Klicken des Erweitert-Buttons oder durch Klicken des Konto-Menüpunktes im Bearbeiten-Menü des Hauptfensters erreichen."
+#: ../src/config.py:3129 ../src/config.py:3320
+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 "
+"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:3187
+#: ../src/config.py:3147
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
-#: ../src/config.py:3188
+#: ../src/config.py:3148
 msgid "Please provide a server on which you want to register."
-msgstr "Bitte geben Sie an, bei dem Sie sich registrieren möchten."
+msgstr "Bitte geben Sie den Server an, bei dem Sie sich registrieren möchten."
 
-#: ../src/config.py:3239
-#: ../src/gajim.py:2007
+#: ../src/config.py:3199 ../src/gajim.py:2101
 msgid "Certificate Already in File"
-msgstr "Zertifikat schon in der Datei"
+msgstr "Zertifikat bereits in der Datei"
 
-#: ../src/config.py:3240
-#: ../src/gajim.py:2008
+#: ../src/config.py:3200 ../src/gajim.py:2102
 #, 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 Datei %s befindet."
+msgstr ""
+"Dieses Zertifikat wird nicht erneut hinzugefügt, da es sich bereit in der "
+"Datei %s befindet."
 
-#: ../src/config.py:3308
+#: ../src/config.py:3268
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -5859,12 +6368,11 @@
 msgstr ""
 "<B>Sicherheitswartnung</b>\n"
 "\n"
-"Die Echtheit des SSL-Zertifikates %(hostname)s könnte ungültig sein.\n"
+"Möglicherweise ist das SSL-Zertifikat %(hostname)s nicht echt.\n"
 "SSL-Fehler: %(error)s\n"
-"Möchten Sie dennoch zum Server verbinden?"
+"Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/config.py:3314
-#: ../src/gajim.py:2031
+#: ../src/config.py:3274 ../src/gajim.py:2126
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -5875,109 +6383,149 @@
 "SHA1-Fingerprint dieses Zertifikates:\n"
 "%s"
 
-#: ../src/config.py:3337
-#: ../src/config.py:3376
+#: ../src/config.py:3299 ../src/config.py:3340
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3357
+#: ../src/config.py:3319
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:3460
+#: ../src/config.py:3406
 msgid "Account name is in use"
-msgstr "Kontoname ist schon vergeben"
+msgstr "Der Kontoname ist bereits vergeben"
 
-#: ../src/config.py:3461
+#: ../src/config.py:3407
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/conversation_textview.py:562
+#: ../src/config.py:3560
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/config.py:3568
+msgid "Event"
+msgstr "Ereignis"
+
+#: ../src/config.py:3603
+msgid "First Message Received"
+msgstr "Erste empfangene Nachricht"
+
+#: ../src/config.py:3604
+msgid "Next Message Received Focused"
+msgstr "Nächste empfangene Nachricht ausgewählt"
+
+#: ../src/config.py:3606
+msgid "Next Message Received Unfocused"
+msgstr "Nächste empfangene Nachricht nicht ausgewählt"
+
+#: ../src/config.py:3607
+msgid "Contact Connected"
+msgstr "Kontakt verbunden"
+
+#: ../src/config.py:3608
+msgid "Contact Disconnected"
+msgstr "Kontakt nicht verbunden"
+
+#: ../src/config.py:3609
+msgid "Message Sent"
+msgstr "Nachricht gesendet"
+
+#: ../src/config.py:3610
+msgid "Group Chat Message Highlight"
+msgstr "Hervorhebung von Chatraum-Nachrichten"
+
+#: ../src/config.py:3611
+msgid "Group Chat Message Received"
+msgstr "Chatraum-Nachricht empfangen"
+
+#: ../src/config.py:3612
+msgid "GMail Email Received"
+msgstr "E-Mail über Google-Mail empfangen"
+
+#: ../src/conversation_textview.py:560
 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 ""
 "Das Symbol zeigt an, dass diese Nachricht noch nicht\n"
-"am entfernten Ende eingetroffen ist. Falls das Symbol für eine\n"
-"längere Zeit bleibt, ging die Nachricht höchstwahrscheinlich verloren."
+"am anderen Ende eingetroffen ist. Falls es längere\n"
+"Zeit bleibt, ging die Nachricht höchstwahrscheinlich verloren."
 
-#: ../src/conversation_textview.py:581
+#: ../src/conversation_textview.py:579
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
-msgstr "Text unterhalb dieser Linie stellt dar, was seit ihrem letzten Besuch in diesem Gruppenchat gesagt wurde"
+msgstr ""
+"Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in "
+"diesem Chatraum gesagt wurde."
 
-#: ../src/conversation_textview.py:691
+#: ../src/conversation_textview.py:693
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:703
+#: ../src/conversation_textview.py:705
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:708
+#: ../src/conversation_textview.py:710
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:727
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
-msgstr "In Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
+msgstr "Im Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:738
+#: ../src/conversation_textview.py:740
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
-msgstr "In Websuche URL fehlt ein \"%s\""
+msgstr "In der URL für die Websuche fehlt ein \"%s\""
 
-#: ../src/conversation_textview.py:741
+#: ../src/conversation_textview.py:743
 msgid "Web _Search for it"
-msgstr "Im _Internet suchen"
+msgstr "Im _Internet hiernach suchen"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:749
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
-#: ../src/conversation_textview.py:1014
-#: ../src/conversation_textview.py:1032
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Fehler beim Ausführen von \"%(command)s\": %(error)s"
-
-#: ../src/conversation_textview.py:1289
+#: ../src/conversation_textview.py:1203
 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:1293
+#: ../src/conversation_textview.py:1207
 #, python-format
 msgid "%i days ago"
 msgstr "Vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1327
+#: ../src/conversation_textview.py:1241
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
 #: ../src/dataforms_widget.py:540
 msgid "Jabber ID already in list"
-msgstr "Jabber-ID bereits in der Liste"
+msgstr "Die Jabber-ID steht bereits in der Liste"
 
 #: ../src/dataforms_widget.py:541
 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ähle eine andere."
+msgstr ""
+"Die eingegebene Jabber-ID ist bereits in der Liste. Wählen Sie bitte eine "
+"andere."
 
 #. Default jid
 #: ../src/dataforms_widget.py:552
 msgid "new at jabber.id"
 msgstr "neu at jabber.id"
 
-#: ../src/dataforms_widget.py:555
-#: ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
 #, python-format
 msgid "new%d at jabber.id"
 msgstr "neu%d at jabber.id"
@@ -5990,21 +6538,21 @@
 #: ../src/dialogs.py:77
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
-msgstr "Jabber-ID: <i>%s</i> "
+msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
@@ -6012,530 +6560,504 @@
 msgid "Set Mood"
 msgstr "Stimmung setzen"
 
-#: ../src/dialogs.py:548
+#: ../src/dialogs.py:549
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusnachricht"
 
-#: ../src/dialogs.py:550
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Statusnachricht"
 
-#: ../src/dialogs.py:662
+#: ../src/dialogs.py:664
 msgid "Overwrite Status Message?"
 msgstr "Statusnachricht überschreiben"
 
-#: ../src/dialogs.py:663
-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:665
+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:672
+#: ../src/dialogs.py:674
 msgid "Save as Preset Status Message"
-msgstr "Als derzeitige Statusnachricht speichern"
+msgstr "Als Vorlage für Statusnachrichten speichern"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:675
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:681
 msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:682
 msgid "GG Number:"
-msgstr "GG Nummer"
+msgstr "GG-Nummer"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:683
 msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:684
 msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:685
 msgid "Yahoo! Address:"
-msgstr "Yahoo!-Adresse"
+msgstr "Yahoo-Adresse"
 
-#: ../src/dialogs.py:719
+#: ../src/dialogs.py:721
 #, 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"
+msgstr ""
+"Bitte füllen Sie die Daten für den Kontakt aus, den Sie dem Konto %s "
+"hinzufügen wollen"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:723
 msgid "Please fill in the data of the contact you want to add"
-msgstr "Bitte geben sie die Daten des neuen Kontakts ein"
+msgstr "Bitte geben Sie die Daten des neuen Kontakts ein"
 
-#: ../src/dialogs.py:878
-#: ../src/dialogs.py:884
-#: ../src/dialogs.py:889
+#: ../src/dialogs.py:880 ../src/dialogs.py:886 ../src/dialogs.py:891
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer-ID"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:887
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine Ressource enthalten."
 
-#: ../src/dialogs.py:890
+#: ../src/dialogs.py:892
 msgid "You cannot add yourself to your roster."
-msgstr "Es ist nicht möglich sich selber zu seiner Kontaktliste hinzuzufügen."
+msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:904
+#: ../src/dialogs.py:906
 msgid "Contact already in roster"
 msgstr "Kontakt bereits in der Kontaktliste"
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:907
 msgid "This contact is already listed in your roster."
-msgstr "Der Kontakt befindet sich bereit in Ihrer Kontaktliste."
+msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
 
-#: ../src/dialogs.py:941
+#: ../src/dialogs.py:943
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:999
+#: ../src/dialogs.py:1001
 msgid "A GTK+ jabber client"
-msgstr "Ein GTK+ Jabber-Client"
+msgstr "Ein Jabber-Client in GTK+"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1002
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1003
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1013
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1015
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:1019
+#: ../src/dialogs.py:1021
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1025
+#: ../src/dialogs.py:1027
 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 at somewhere>
-#: ../src/dialogs.py:1038
+#: ../src/dialogs.py:1040
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
 "Benjamin Drung (benjamin.drung AT gmail.com)\n"
 "Fabian Fingerle (fabian AT datensalat.eu)\n"
 "Sebastian Schäfer (sarek AT uliweb.de)\n"
-"Nico Gulden (cilugnedon AT gmx.de)"
+"Nico Gulden (cilugnedon AT gmx.de)\n"
+"Niklas Hambüchen (nh2 AT deditus.de)"
 
-#: ../src/dialogs.py:1200
+#: ../src/dialogs.py:1202
 #, python-format
 msgid ""
-"You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option.\n"
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
 "\n"
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-"Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, um die Rechtschreibprüfung zu nutzen.\n"
+"Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
+"um die Rechtschreibprüfung nutzen zu können.\n"
 "\n"
-"Das Hervorheben falsch geschriebener Worte wird nicht genutzt"
+"Falsch geschriebene Wörter können nicht hervorgehoben werden."
 
-#: ../src/dialogs.py:1604
+#: ../src/dialogs.py:1606
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
-msgstr "Abonnement-Anfrage für Konto %(account)s von %(jid)s"
+msgstr "Abonnement-Anfrage für das Konto %(account)s von %(jid)s"
 
-#: ../src/dialogs.py:1607
+#: ../src/dialogs.py:1609
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anfrage von %s"
 
-#: ../src/dialogs.py:1668
-#: ../src/gajim.py:2632
+#: ../src/dialogs.py:1673 ../src/gajim.py:2766
 #, python-format
 msgid "You are already in group chat %s"
-msgstr "Sie sind bereits im Gruppenchat %s"
+msgstr "Sie sind bereits im Chatraum %s"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1681
 msgid "You can not join a group chat unless you are connected."
-msgstr "Sie können einem Gruppenchat erst beitreten, wenn Sie verbunden sind."
+msgstr "Sie können einen Chatraum erst betreten, wenn Sie verbunden sind."
 
-#: ../src/dialogs.py:1695
+#: ../src/dialogs.py:1700
 #, python-format
 msgid "Join Group Chat with account %s"
-msgstr "Betrete Gruppenchat mit Account %s"
+msgstr "Chatraum betreten mit dem Konto %s"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:1771
 msgid "Invalid Nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:1767
-#: ../src/groupchat_control.py:1454
-#: ../src/groupchat_control.py:1735
+#: ../src/dialogs.py:1772 ../src/groupchat_control.py:1455
+#: ../src/groupchat_control.py:1738
 msgid "The nickname has not allowed characters."
-msgstr "Die Jabber-ID für den Gruppenchat enthält nicht erlaubte Zeichen."
+msgstr "Die Jabber-ID enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:1771
-#: ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:1776 ../src/dialogs.py:1782
+#: ../src/groupchat_control.py:1908
 msgid "Invalid group chat Jabber ID"
-msgstr "Ungültige Jabber-ID für den Gruppenchat"
+msgstr "Ungültige Jabber-ID für den Chatraum"
 
-#: ../src/dialogs.py:1772
-#: ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1903
+#: ../src/dialogs.py:1777 ../src/dialogs.py:1783
+#: ../src/groupchat_control.py:1909
 msgid "The group chat Jabber ID has not allowed characters."
-msgstr "Die Jabber-ID für den Gruppenchat enthält nicht erlaubte Zeichen."
+msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:1789
 msgid "This is not a group chat"
-msgstr "Das ist kein Gruppenchat"
+msgstr "Dies ist kein Chatraum"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:1790
 #, python-format
 msgid "%s is not the name of a group chat."
-msgstr "%s ist kein Name eines Gruppenchats."
+msgstr "%s ist nicht der Name eines Chatraums."
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:1817
 msgid "Without a connection, you can not synchronise your contacts."
-msgstr "Sie müssen verbunden sein, um Ihre Kontakte zu Synchronisieren."
+msgstr "Sie müssen verbunden sein, um Ihre Kontakte synchronisieren zu können."
 
-#: ../src/dialogs.py:1826
+#: ../src/dialogs.py:1831
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1864
 msgid "This account is not connected to the server"
-msgstr "Konto \"%s\" ist nicht mit dem Server verbunden"
+msgstr "Das Konto \"%s\" ist nicht mit dem Server verbunden"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:1865
 msgid "You cannot synchronize with an account unless it is connected."
-msgstr "Sie können nicht mit einem Konto Synchronisieren, solange es nicht verbunden ist."
+msgstr ""
+"Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
 
-#: ../src/dialogs.py:1884
+#: ../src/dialogs.py:1889
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:1947
 #, python-format
 msgid "Start Chat with account %s"
-msgstr "Starte Chat mit Account %s"
+msgstr "Starte Chat mit Konto %s"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:1949
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:1945
+#: ../src/dialogs.py:1950
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
-"Geben Sie die JID oder den Spitznamen des Kontaktes ein,\n"
+"Geben Sie die Jabber-ID oder den Spitznamen des Kontaktes ein,\n"
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969
-#: ../src/dialogs.py:2344
-#: ../src/dialogs.py:2494
+#: ../src/dialogs.py:1974 ../src/dialogs.py:2348 ../src/dialogs.py:2498
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:1970
-#: ../src/dialogs.py:2345
-#: ../src/dialogs.py:2495
+#: ../src/dialogs.py:1975 ../src/dialogs.py:2349 ../src/dialogs.py:2499
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:1979
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:1984 ../src/dialogs.py:1987
 msgid "Invalid JID"
-msgstr "Ungültige JID"
+msgstr "Ungültige Jabber-ID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:1987
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:1996
 msgid "Without a connection, you can not change your password."
-msgstr "Sie müssen verbunden sein, um Ihr Passwort zu ändern"
+msgstr "Sie müssen verbunden sein, um Ihr Passwort ändern zu können."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2015
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2015
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2019
 msgid "Passwords do not match"
-msgstr "Passwörter stimmen nicht überein"
+msgstr "Die Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2020
 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:2055
-#: ../src/notify.py:245
-#: ../src/notify.py:473
+#: ../src/dialogs.py:2060 ../src/notify.py:261 ../src/notify.py:502
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:2057
-#: ../src/notify.py:253
-#: ../src/notify.py:475
+#: ../src/dialogs.py:2062 ../src/notify.py:269 ../src/notify.py:504
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #. chat message
-#: ../src/dialogs.py:2059
-#: ../src/notify.py:276
-#: ../src/notify.py:477
-#: ../src/osx/growler.py:12
+#. img to display
+#: ../src/dialogs.py:2064 ../src/notify.py:292 ../src/notify.py:346
+#: ../src/notify.py:506 ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:2059
-#: ../src/notify.py:257
-#: ../src/notify.py:477
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2064 ../src/notify.py:273 ../src/notify.py:347
+#: ../src/notify.py:506 ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
 #. private message
-#: ../src/dialogs.py:2060
-#: ../src/notify.py:264
-#: ../src/notify.py:478
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2065 ../src/notify.py:280 ../src/notify.py:347
+#: ../src/notify.py:507 ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:2060
-#: ../src/gajim.py:1594
-#: ../src/notify.py:486
+#: ../src/dialogs.py:2065 ../src/gajim.py:1675 ../src/notify.py:516
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:2062
-#: ../src/gajim.py:1660
-#: ../src/notify.py:480
+#: ../src/dialogs.py:2067 ../src/gajim.py:1741 ../src/notify.py:509
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: ../src/dialogs.py:2064
-#: ../src/gajim.py:1560
-#: ../src/gajim.py:1627
-#: ../src/notify.py:482
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2069 ../src/gajim.py:1641 ../src/gajim.py:1708
+#: ../src/notify.py:511 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Dateiübertragungsfehler"
 
-#: ../src/dialogs.py:2066
-#: ../src/gajim.py:1702
-#: ../src/gajim.py:1724
-#: ../src/gajim.py:1741
-#: ../src/notify.py:484
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2071 ../src/gajim.py:1783 ../src/gajim.py:1805
+#: ../src/gajim.py:1822 ../src/notify.py:513 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Dateiübertragung beendet"
 
-#: ../src/dialogs.py:2067
-#: ../src/gajim.py:1705
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2072 ../src/gajim.py:1786 ../src/notify.py:514
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: ../src/dialogs.py:2069
-#: ../src/gajim.py:1450
-#: ../src/notify.py:488
+#: ../src/dialogs.py:2074 ../src/gajim.py:1493 ../src/notify.py:518
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/dialogs.py:2071
-#: ../src/notify.py:237
-#: ../src/notify.py:490
+#: ../src/dialogs.py:2076 ../src/notify.py:253 ../src/notify.py:520
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2267
 #, python-format
 msgid "Single Message using account %s"
-msgstr "Einzelne Nachricht mit Account %s"
+msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2265
+#: ../src/dialogs.py:2269
 #, python-format
 msgid "Single Message in account %s"
-msgstr "Einzelne Nachricht in Account %s"
+msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2267
+#: ../src/dialogs.py:2271
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2274
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293
+#: ../src/dialogs.py:2297
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316
+#: ../src/dialogs.py:2320
 #, 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:2395
+#: ../src/dialogs.py:2399
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2396
+#: ../src/dialogs.py:2400
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:2440
+#: ../src/dialogs.py:2444
 #, python-format
 msgid "XML Console for %s"
-msgstr "XML Konsole für %s"
+msgstr "XML-Konsole für %s"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2446
 msgid "XML Console"
-msgstr "XML Konsole"
+msgstr "XML-Konsole"
 
-#: ../src/dialogs.py:2566
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
-msgstr "Privatliste <b><i>%s</i></b>"
+msgstr "Privatsphären-Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2574
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:2626
+#: ../src/dialogs.py:2630
 #, 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"
+msgstr ""
+"Sortierung: %(order)s, Aktion: %(action)s, Typ: %(type)s, Wert: %(value)s"
 
-#: ../src/dialogs.py:2631
+#: ../src/dialogs.py:2635
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sortierung: %(order)s, Aktion: %(action)s"
 
-#: ../src/dialogs.py:2673
+#: ../src/dialogs.py:2677
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:2760
+#: ../src/dialogs.py:2764
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:2860
 #, python-format
 msgid "Privacy Lists for %s"
-msgstr "Privatliste für %s"
+msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:2862
 msgid "Privacy Lists"
-msgstr "Privatlisten"
+msgstr "Privatsphären-Listen"
 
-#: ../src/dialogs.py:2928
+#: ../src/dialogs.py:2932
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:2933
 msgid "You must enter a name to create a privacy list."
-msgstr "Sie müssen einen Namen eingeben um eine Privatsphären-Liste zu erstellen."
+msgstr ""
+"Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
+"können."
 
-#: ../src/dialogs.py:2961
+#: ../src/dialogs.py:2965
 msgid "You are invited to a groupchat"
-msgstr "Sie wurden in Gruppenchat eingeladen"
+msgstr "Sie wurden in einen Chatraum eingeladen"
 
-#: ../src/dialogs.py:2964
+#: ../src/dialogs.py:2968
 msgid "$Contact has invited you to join a discussion"
-msgstr "$Contact hat Sie in den Gruppenchat %(room_jid)s eingeladen"
+msgstr "$Contact hat Sie in den Chatraum %(room_Jabber-ID)s eingeladen"
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:2970
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
-msgstr "$Contact hat Sie in den Gruppenchat %(room_jid)s eingeladen"
+msgstr "$Contact hat Sie in den Chatraum %(room_jid)s eingeladen"
 
-#: ../src/dialogs.py:2974
+#: ../src/dialogs.py:2978
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:2980
 msgid "Do you want to accept the invitation?"
 msgstr "Möchten Sie die Einladung annehmen?"
 
-#: ../src/dialogs.py:3031
+#: ../src/dialogs.py:3036
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:3041
-#: ../src/dialogs.py:3092
+#: ../src/dialogs.py:3046 ../src/dialogs.py:3097
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3051
 msgid "Wav Sounds"
-msgstr "Wav Dateien"
+msgstr "Wav-Dateien"
 
-#: ../src/dialogs.py:3079
+#: ../src/dialogs.py:3084
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:3097
+#: ../src/dialogs.py:3102
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3162
+#: ../src/dialogs.py:3167
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3169
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
 #. # means number
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3238
 msgid "#"
 msgstr "Nr."
 
-#: ../src/dialogs.py:3239
+#: ../src/dialogs.py:3244
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:3357
+#: ../src/dialogs.py:3362
 msgid "when I am "
 msgstr "wenn Ich bin "
 
-#: ../src/dialogs.py:3829
+#: ../src/dialogs.py:3834
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6544,70 +7066,98 @@
 msgstr ""
 "Ihre Unterhaltung mit <b>%(jid)s</b> ist verschlüsselt.\n"
 "\n"
-"Der Kurz-Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>%(sas)s</b>"
+"Der kurze Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>%(sas)"
+"s</b>"
 
-#: ../src/dialogs.py:3833
+#: ../src/dialogs.py:3838
 msgid "You have already verified this contact's identity."
-msgstr "Sie haben bereits die Identität dieses Kontaktes überprüft."
+msgstr "Sie haben die Identität dieses Kontaktes bereits überprüft."
 
-#: ../src/dialogs.py:3839
-#: ../src/dialogs.py:3926
+#: ../src/dialogs.py:3844 ../src/dialogs.py:3931
 msgid "Contact's identity verified"
-msgstr "Kontaktidentität überprüft"
+msgstr "Kontaktidentität wurde überprüft"
 
-#: ../src/dialogs.py:3847
+#: ../src/dialogs.py:3852
 msgid "Verify again..."
-msgstr "Nochmal überprüfen ..."
+msgstr "Erneut überprüfen …"
 
-#: ../src/dialogs.py:3852
-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 "Um sicher zu stellen, dass <b>nur</b> die erwartete Person Nachrichten von Ihnen lesen kann oder Ihnen Nachrichten senden kann, müssen Sie die Identität überprüfen, indem Sie den Knopf unten drücken."
+#: ../src/dialogs.py:3857
+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 ""
+"Um sicher zu stellen, dass <b>nur</b> der beabsichtigte Empfänger Ihre "
+"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:3855
-#: ../src/dialogs.py:3907
-#: ../src/dialogs.py:3920
+#: ../src/dialogs.py:3860 ../src/dialogs.py:3912 ../src/dialogs.py:3925
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktidentität nicht überprüft"
 
-#: ../src/dialogs.py:3862
+#: ../src/dialogs.py:3867
 msgid "Verify..."
-msgstr "Überprüfen ..."
+msgstr "Überprüfen …"
 
-#: ../src/dialogs.py:3874
+#: ../src/dialogs.py:3879
 msgid "Have you verified the contact's identity?"
 msgstr "Haben Sie die Identität des Kontaktes überprüft?"
 
-#: ../src/dialogs.py:3875
+#: ../src/dialogs.py:3880
 #, python-format
 msgid ""
-"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> directly (in person or on the phone) and verify that they see the same Short Authentication String (SAS) as you.\n"
+"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
+"directly (in person or on the phone) and verify that they see the same Short "
+"Authentication String (SAS) as you.\n"
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
-"Um zu verhindern, dass Sie mit einer anderen Person reden, sollten Sie <b>%(jid)s</b> kontaktieren (persönlich oder telefonisch), um den Kurz-Authentifizierungs-Schlüssel beidseitig zu überprüfen.\n"
+"Um zu verhindern, dass Sie mit einer anderen Person reden, sollten Sie <b>%"
+"(jid)s</b> kontaktieren (persönlich oder telefonisch), um den kurzen "
+"Authentifizierungs-Schlüssel beidseitig zu überprüfen.\n"
 "\n"
-"Der Kurz-Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</b>"
+"Der kurze Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</"
+"b>"
 
-#: ../src/dialogs.py:3876
+#: ../src/dialogs.py:3881
 msgid "Did you talk to the remote contact and verify the SAS?"
-msgstr "Haben Sie mit dem Kontakt gesprochen um den Kurz-Authentifizierungs-Schluessel zu überprüfen?"
+msgstr ""
+"Haben Sie mit dem Kontakt gesprochen, um den kurzen Authentifizierungs-"
+"Schluessel zu überprüfen?"
 
-#: ../src/dialogs.py:3908
+#: ../src/dialogs.py:3913
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
-msgstr "Der Kontaktschlüssel (%s) <b>stimmt nicht</b> mit dem in Gajim zugewiesenen Schlüssel überein."
+msgstr ""
+"Der Kontaktschlüssel (%s) <b>stimmt nicht</b> mit dem in Gajim zugewiesenen "
+"Schlüssel überein."
 
-#: ../src/dialogs.py:3914
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/dialogs.py:3919
 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."
+msgstr ""
+"Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht "
+"verschlüsselt werden."
 
-#: ../src/dialogs.py:3921
-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 "GPG-Schlüssel ist dem Kontakt zugewiesen, aber <b>Sie vertrauen seinem Schlüssel nicht<b/>. Die Nachricht <b>kann nicht</b> verschlüsselt werden. Benutzen Sie den GPG-Client, um dem Schlüssel zu vertrauen."
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/dialogs.py:3926
+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 ""
+"Ein GPG-Schlüssel ist dem Kontakt zugewiesen, aber <b>Sie vertrauen dem "
+"Schlüssel nicht<b/>. Die Nachricht <b>kann nicht</b> verschlüsselt werden. "
+"Benutzen Sie den GPG-Client, um den Schlüssel als vertrauenswürdig "
+"einzustufen."
 
-#: ../src/dialogs.py:3927
-msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
-msgstr "GPG-Schlüssel ist dem Kontakt zugewiesen, Sie vertrauen dem Schlüssel. Nachrichten werden verschlüsselt."
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/dialogs.py:3932
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+"Ein vertrauenswürdiger GPG-Schlüssel ist dem Kontakt zugewiesen. Die "
+"Nachrichten werden verschlüsselt."
 
 #: ../src/disco.py:116
 msgid "Others"
@@ -6620,330 +7170,360 @@
 
 #: ../src/disco.py:440
 msgid "Without a connection, you can not browse available services"
-msgstr "Sie müssen angemeldet sein um Dienste zu durchsuchen"
+msgstr "Sie müssen angemeldet sein, um die Dienste durchsuchen zu können"
 
 #: ../src/disco.py:514
 #, python-format
 msgid "Service Discovery using account %s"
-msgstr "Dienste durchsuchen für Konto %s"
+msgstr "Dienste des Kontos %s durchsuchen"
 
 #: ../src/disco.py:516
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:657
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../src/disco.py:657
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Es existiert kein Dienst an der Adresse, die sie angegeben haben oder er antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es erneut."
+#: ../src/disco.py:658
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Es existiert kein Dienst an der Adresse, die Sie angegeben haben, oder der "
+"Dienst antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es "
+"erneut."
 
-#: ../src/disco.py:661
-#: ../src/disco.py:957
+#: ../src/disco.py:662 ../src/disco.py:958
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:663
 msgid "This type of service does not contain any items to browse."
-msgstr "Dieser Art von Dienst enthält keine Objekte, di edurchsucht werden können."
+msgstr ""
+"Dieser Art von Dienst enthält keine Objekte, die durchsucht werden können."
 
-#: ../src/disco.py:699
-#: ../src/disco.py:709
+#: ../src/disco.py:700 ../src/disco.py:710
 msgid "Invalid Server Name"
 msgstr "Ungültiger Servername"
 
-#: ../src/disco.py:756
+#: ../src/disco.py:757
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
-msgstr "Durchsuche %(address)s mit Konto %(account)s"
+msgstr "Durchsuche %(address)s über das Konto %(account)s"
 
-#: ../src/disco.py:796
+#: ../src/disco.py:797
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:958
+#: ../src/disco.py:959
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1180
+#: ../src/disco.py:1181
 msgid "_Execute Command"
 msgstr "_Befehl ausführen"
 
-#: ../src/disco.py:1190
-#: ../src/disco.py:1354
+#: ../src/disco.py:1191 ../src/disco.py:1355
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1391
+#: ../src/disco.py:1392
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Durchsuche %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1573
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1581
 msgid "Description"
 msgstr "Beschreibung"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1589
 msgid "Id"
-msgstr "Id"
+msgstr "ID"
 
-#: ../src/disco.py:1817
+#: ../src/disco.py:1818
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../src/disco.py:1825
+#: ../src/disco.py:1826
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1882
+#: ../src/disco.py:1883
 msgid "New post"
 msgstr "Neue Nachricht"
 
-#: ../src/disco.py:1888
+#: ../src/disco.py:1889
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/disco.py:1894
+#: ../src/disco.py:1895
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
-#: ../src/features_window.py:49
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:45
+msgid "SSL certificat validation"
+msgstr "SSL/TLS-Zertifikatprüfung"
 
-#: ../src/features_window.py:50
-msgid "A library used to validate server certificates to ensure a secure connection."
-msgstr "Eine Bibliothek um Server-Zertifikate zu validieren um eine sichere Verbindung zu gewährleisten."
+#: ../src/features_window.py:46
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Ermöglicht die Validierung von Server-Zertifikaten, die eine sichere "
+"Verbindung gewährleisten."
 
-#: ../src/features_window.py:51
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47 ../src/features_window.py:48
 msgid "Requires python-pyopenssl."
 msgstr "Erfordert python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:49
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:50
 msgid "Serverless chatting with autodetected clients in a local network."
-msgstr "Serverloses Chatten mit automatisch erkannten Clients in einem lokalen Netz"
+msgstr ""
+"Ermöglicht serverloses Chatten mit automatischer Clienterkennung in lokalen "
+"Netzwerken."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:51
 msgid "Requires python-avahi."
 msgstr "Erfordert python-avahi."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:52
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr ""
+"Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour (Englisch))."
 
-#: ../src/features_window.py:57
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:53
+msgid "Command line"
+msgstr "Kommandozeilensteuerung"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:54
 msgid "A script to control Gajim via commandline."
-msgstr "Ein Skript, um Gajim über die Befehlszeile zu steuern."
+msgstr "Ermöglicht es, Gajim per Skript über die Konsole zu steuern."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:55
 msgid "Requires python-dbus."
 msgstr "Erfordert python-dbus."
 
-#: ../src/features_window.py:60
-#: ../src/features_window.py:64
-#: ../src/features_window.py:68
-#: ../src/features_window.py:72
-#: ../src/features_window.py:76
+#: ../src/features_window.py:56 ../src/features_window.py:60
+#: ../src/features_window.py:64 ../src/features_window.py:68
+#: ../src/features_window.py:72 ../src/features_window.py:80
 #: ../src/features_window.py:84
-#: ../src/features_window.py:88
 msgid "Feature not available under Windows."
 msgstr "Funktion unter Windows nicht verfügbar."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+#: ../src/features_window.py:57
+msgid "OpenGPG message encryption"
+msgstr "OpenPGP-Verschlüsselung"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chatmessages with gpg keys."
-msgstr "Chat Nachrichten werden mit gpg Schlüssel verschlüsselt"
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/features_window.py:58
+msgid "Encrypting chat messages with gpg keys."
+msgstr "Ermöglicht die Verschlüsselung von Nachrichten per OpenPGP."
 
-#: ../src/features_window.py:63
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/features_window.py:59
 msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Erfordert gpg und python-GnuPGInterface."
+msgstr "Erfordert GnuPG und python-GnuPGInterface."
 
-#: ../src/features_window.py:65
-msgid "network-manager"
-msgstr "network-manager"
+#: ../src/features_window.py:61
+msgid "Network-manager"
+msgstr "Netzwerk-Manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:62
 msgid "Autodetection of network status."
-msgstr "Auto-Erkennung des Netzwerk-Status."
+msgstr "Ermöglicht die automatische Erkennung des Netzwerkstatus."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:63
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Erfordert gnome-network-manager und python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:65
 msgid "Session Management"
 msgstr "Sitzungsverwaltung"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:66
 msgid "Gajim session is stored on logout and restored on login."
-msgstr "Gajim-Sitzung wird beim Logout gespeichert und beim Login wiederhergestellt"
+msgstr ""
+"Die Gajim-Sitzung kann beim Logout gespeichert und beim Login "
+"wiederhergestellt werden."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:67
 msgid "Requires python-gnome2."
 msgstr "Erfordert python-gnome2."
 
-#: ../src/features_window.py:73
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:69
+msgid "Password encryption"
+msgstr "Sichere Kennwortverwaltung"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:70
 msgid "Passwords can be stored securely and not just in plaintext."
-msgstr "Passwörter können sicher und nicht nur im Klartext gespeichert werden"
+msgstr "Passwörter können sicher anstatt nur im Klartext gespeichert werden."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:71
 msgid "Requires gnome-keyring and python-gnome2-desktop."
 msgstr "Erfordert gnome-keyring und python-gnome2-desktop."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:73
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:74
 msgid "Ability to connect to servers which are using SRV records."
-msgstr "Fähigkeit zu Servern die SRV-Einträge verwenden zu verbinden."
+msgstr "Ermöglicht Verbindungen zu Servern, die SRV-DNS-Einträge verwenden."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:75
 msgid "Requires dnsutils."
 msgstr "Erfordert dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:76
 msgid "Requires nslookup to use SRV records."
 msgstr "Erfordert nslookup zur Nutzung von SRV-Einträgen."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:77
 msgid "Spell Checker"
 msgstr "Rechtschreibprüfung"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:78
 msgid "Spellchecking of composed messages."
-msgstr "Rechtschreibprüfung erstellter Nachrichten."
+msgstr ""
+"Ermöglicht das Überprüfen verfasster Nachrichten auf Rechtschreibfehler."
 
-#: ../src/features_window.py:83
-msgid "Requires python-gnome2-extras or compilation of gtkspell module from Gajim sources."
-msgstr "Erfordert python-gnome2-extras oder die Kompilation des gtkspell-Moduls aus den Gajim-Quellen."
+#: ../src/features_window.py:79
+msgid "Requires libgtkspell."
+msgstr "Erfordert die libgtkspell-Bibliothek."
 
-#: ../src/features_window.py:85
-msgid "Notification-daemon"
-msgstr "Notification-daemon"
+#: ../src/features_window.py:81
+msgid "Notification"
+msgstr "Benachrichtigungen"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:82
 msgid "Passive popups notifying for new events."
-msgstr "Passive Popups informieren über neue Ereignisse."
+msgstr "Ermöglicht passive Popups, die über neue Ereignisse informieren."
 
-#: ../src/features_window.py:87
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
-msgstr "Erforder python-notify oder stattdessen python-dbus in Verbindung mit notification-daemon."
+#: ../src/features_window.py:83
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+"Erfordert python-notify oder stattdessen python-dbus in Verbindung mit "
+"notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:85
 msgid "Trayicon"
 msgstr "Tray-Symbol"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:86
 msgid "A icon in systemtray reflecting the current presence."
-msgstr "Ein Icon im Systemtray, das den Status widerspiegelt."
+msgstr "Ein Symbol im Systemtray, das den Status widerspiegelt."
 
-#: ../src/features_window.py:91
-msgid "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr "Erfordert python-gnome2-extras oder das kompilierte Trayicon-Modul aus den Gajim-Quellen"
+#: ../src/features_window.py:87
+msgid ""
+"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
+msgstr ""
+"Erfordert python-gnome2-extras oder die Kompilation des Trayicon-Moduls aus "
+"den Gajim-Quellen"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:88
 msgid "Requires PyGTK >= 2.10."
 msgstr "Erforder PyGTK >= 2.10."
 
-#: ../src/features_window.py:93
-msgid "Idle"
-msgstr "Idle"
+#: ../src/features_window.py:89
+msgid "Automatic status"
+msgstr "Automatischer Status"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:90
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Fähigkeit die Idle-Zeit zu messen um den Status automatisch zu setzen"
+msgstr ""
+"Emöglicht die Messung der Zeit, während der der Computer nicht benutzt wird, "
+"um den Status automatisch zu setzen."
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:91
 msgid "Requires libxss library."
-msgstr "Erfordert libxss library."
+msgstr "Erfordert die libxss-Bibliothek."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:92
 msgid "Requires python2.5."
-msgstr "Erfordert python2.5"
+msgstr "Erfordert python-gnome2 (Version 2.5)."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:93
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:94
 msgid "Transform LaTeX expressions between $$ $$."
-msgstr "LaTeX-Ausdrücke zwischen $$ $$ umwandeln."
+msgstr ""
+"Ermöglicht die Verwendung von LaTeX-Ausdrücken. Text zwischen $$ $$ wird als "
+"LaTeX interpretiert."
 
-#: ../src/features_window.py:99
-msgid "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "Erfordert texlive-latex-base und dvipng (Findet sich alles in MikTeX). Sie müssen 'use_latex' im Advanced Configuration Editor auf 'true' setzen."
+#: ../src/features_window.py:95
+msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
+"Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Im "
+"erweiterten Konfigurationseditor muss 'use_latex' auf 'true' gesetzt werden."
 
-#: ../src/features_window.py:100
-msgid "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr "Erfordert texlive-latex-base und dvipng (Findet sich alles in MikTeX). Sie müssen 'use_latex' im Advanced Configuration Editor auf 'true' setzen."
+#: ../src/features_window.py:96
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Sie müssen "
+"'use_latex' im Erweiterten Konfigurationseditor auf 'true' setzen."
 
-#: ../src/features_window.py:101
-msgid "End to End Encryption"
+#: ../src/features_window.py:97
+msgid "End to End message encryption"
 msgstr "ESession-Verschlüsselung"
 
-#: ../src/features_window.py:102
-msgid "Encrypting chatmessages."
-msgstr "Chatnachrichten werden verschlüsselt."
+#: ../src/features_window.py:98
+msgid "Encrypting chat messages."
+msgstr "Nachrichten können per ESession verschlüsselt werden."
 
-#: ../src/features_window.py:103
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99 ../src/features_window.py:100
 msgid "Requires python-crypto."
 msgstr "Erfordert python-crypto"
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:101
 msgid "RST Generator"
-msgstr "RST Generator"
+msgstr "RST-Generator"
 
-#: ../src/features_window.py:106
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "Erzeug aus RST-Code XHTML-Ausgaben (siehe http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
+#: ../src/features_window.py:102
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"Kann aus RST-Code XHTML-Ausgaben erzeugen (siehe http://docutils.sourceforge."
+"net/docs/ref/rst/restructuredtext.html (Englisch))."
 
-#: ../src/features_window.py:107
-#: ../src/features_window.py:108
+#: ../src/features_window.py:103 ../src/features_window.py:104
 msgid "Requires python-docutils."
 msgstr "Erfordert python-docutils."
 
-#: ../src/features_window.py:109
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:105
+msgid "Banners and clickable links"
+msgstr "Anklickbare Links"
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr "Anklickbare URLs im Chat-Fenster."
+msgstr "Anklickbare URLs im Chatfenster."
 
-#: ../src/features_window.py:111
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107 ../src/features_window.py:108
 msgid "Requires python-sexy."
 msgstr "Erfordert python-sexy."
 
-#: ../src/features_window.py:126
+#: ../src/features_window.py:122
 msgid "Feature"
-msgstr "Fähigkeit"
+msgstr "Feature"
 
 #: ../src/filetransfers_window.py:76
 msgid "File"
@@ -6957,23 +7537,20 @@
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../src/filetransfers_window.py:173
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
 #, python-format
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/filetransfers_window.py:174
-#: ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:314
 #, python-format
 msgid "Size: %s"
 msgstr "Größe: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:183
-#: ../src/filetransfers_window.py:193
-#: ../src/history_manager.py:496
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
+#: ../src/history_manager.py:495
 msgid "You"
 msgstr "Sie"
 
@@ -6982,8 +7559,7 @@
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: ../src/filetransfers_window.py:185
-#: ../src/filetransfers_window.py:596
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:597
 #: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Empfänger: "
@@ -6997,13 +7573,11 @@
 msgid "File transfer completed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: ../src/filetransfers_window.py:212
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung abgebrochen"
 
-#: ../src/filetransfers_window.py:212
-#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
 msgid "Connection with peer cannot be established."
 msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
 
@@ -7019,20 +7593,19 @@
 
 #: ../src/filetransfers_window.py:231
 msgid "File transfer stopped by the contact at the other end"
-msgstr "Gegenseite hat Dateiübertragung gestoppt"
+msgstr "Die Gegenseite hat Dateiübertragung gestoppt"
 
 #: ../src/filetransfers_window.py:252
 msgid "Choose File to Send..."
-msgstr "Datei auswählen ..."
+msgstr "Datei auswählen …"
 
-#: ../src/filetransfers_window.py:268
-#: ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
 msgid "Description: "
 msgstr "Beschreibung: "
 
 #: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
-msgstr "Gajim kann auf diese Datei nicht zugreifen"
+msgstr "Auf diese Datei kann nicht zugegriffen werden"
 
 #: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
@@ -7043,63 +7616,63 @@
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:317
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "%s wants to send you a file:"
-msgstr "%s möchte ihnen eine Datei senden:"
+msgstr "%s möchte Ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:332
-#: ../src/gtkgui_helpers.py:817
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:817
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: ../src/filetransfers_window.py:333
-#: ../src/gtkgui_helpers.py:819
-msgid "A file with this name already exists and you do not have permission to overwrite it."
-msgstr "Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die Rechte sie zu überschreiben."
+#: ../src/filetransfers_window.py:334 ../src/gtkgui_helpers.py:819
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die "
+"erforderlichen Rechte, um sie zu überschreiben."
 
-#: ../src/filetransfers_window.py:349
-#: ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
 msgid "This file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../src/filetransfers_window.py:349
-#: ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
 msgid "What do you want to do?"
 msgstr "Was möchten Sie tun?"
 
 #. read-only bit is used to mark special folder under windows,
 #. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:830
+#: ../src/filetransfers_window.py:360 ../src/gtkgui_helpers.py:830
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:831
+#: ../src/filetransfers_window.py:360 ../src/gtkgui_helpers.py:831
 msgid "You do not have permission to create files in this directory."
-msgstr "Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien anzulegen."
+msgstr ""
+"Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
+"anzulegen."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:370
 msgid "Save File as..."
-msgstr "Datei speichern unter ..."
+msgstr "Datei speichern unter …"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:435
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7107,278 +7680,339 @@
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:526
+#: ../src/filetransfers_window.py:527
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:566
-#: ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:567 ../src/filetransfers_window.py:570
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:567
 msgid "File: "
 msgstr "Datei: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:571
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:592
-#: ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:593 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:594
-#: ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:595 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:93
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s ist kein gültiger Loglevel."
-
-#: ../src/gajim.py:165
+#: ../src/gajim.py:145
 msgid "Gajim needs X server to run. Quiting..."
-msgstr "Gajim benötigt einen laufenden X-Server. Breche ab ..."
+msgstr "Gajim benötigt einen laufenden X-Server. Abbruch …"
 
-#: ../src/gajim.py:194
+#: ../src/gajim.py:174
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim benötigt PyGTK 2.6 oder höher"
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:175
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
-msgstr "Gajim benötigt PyGTK 2.6 oder höher. Breche ab ..."
+msgstr "Gajim benötigt PyGTK 2.6 oder höher. Abbruch …"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:177
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim benötigt GTK 2.6 oder höher"
 
-#: ../src/gajim.py:198
+#: ../src/gajim.py:178
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
-msgstr "Gajim benötigt GTK 2.6+. Breche ab ..."
+msgstr "Gajim benötigt GTK 2.6+. Abbruch …"
 
-#: ../src/gajim.py:203
+#: ../src/gajim.py:183
 msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ runtine fehlt libglade-Unterstützung"
+msgstr "Der GTK+-Laufzeitumgebung fehlt die libglade-Unterstützung"
 
-#: ../src/gajim.py:205
+#: ../src/gajim.py:185
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Bitte entfernen Sie Ihre derzeitige GTK+ Laufzeitumgebung und installieren Sie die aktuelle Version von %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Bitte entfernen Sie Ihre derzeitige GTK+-Laufzeitumgebung und installieren "
+"Sie die aktuelle Version von %s"
 
-#: ../src/gajim.py:207
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Bitte stellen Sie sicher, dass GTK+ und PyGTK auf Ihrem System libglade-Unterstützung besitzen."
+#: ../src/gajim.py:187
+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:212
+#: ../src/gajim.py:192
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim benötigt PySQLite2 zum Starten"
 
-#: ../src/gajim.py:220
+#: ../src/gajim.py:200
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim benötigt pywin32 zum Laufen"
 
-#: ../src/gajim.py:221
+#: ../src/gajim.py:201
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Bitte stellen Sie sicher das Pywin32 auf Ihrem System installiert ist. Sie können es unter folgender URL herunterladen: %s "
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Bitte stellen Sie sicher das Pywin32 auf Ihrem Computer installiert ist. Sie "
+"können es unter folgender URL herunterladen: %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:374
+#: ../src/gajim.py:352
 msgid "Gajim is already running"
 msgstr "Gajim läuft bereits"
 
-#: ../src/gajim.py:375
+#: ../src/gajim.py:353
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
-"Eine andere Instanz von Gajim schein bereits zu laufen\n"
-"Trotzdem starten?"
+"Gajim schein bereits zu laufen.\n"
+"Soll eine weitere Instanz gestartet werden?"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:443
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
-#: ../src/gajim.py:501
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gajim.py:444
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "Geben Sie die GPG-Passphrase für den Schlüssel %(keyid)s ein (Konto %(account)s)."
+msgstr ""
+"Geben Sie die GPG-Passphrase für den Schlüssel %(keyid)s ein (Konto: %"
+"(account)s)."
 
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gajim.py:458
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Kein GPG-Schlüssel zugewiesen"
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gajim.py:459
+#, 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:516
+#: ../src/gajim.py:468
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
-#: ../src/gajim.py:517
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gajim.py:469
 msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf Abbrechen."
+msgstr ""
+"Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
+"Abbrechen."
 
-#: ../src/gajim.py:564
+#: ../src/gajim.py:532
 #, python-format
 msgid ""
-"Your desired nickname in group chat %s is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Der gewünschte Benutzername im Gruppenchat %s wird bereits verwendet oder wurde von einem anderen Benutzer registriert.\n"
+"Der gewünschte Benutzername wird bereits im Chatraum %s verwendet oder wurde "
+"von einem anderen Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:546
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gajim.py:580
+#: ../src/gajim.py:548
 #, python-format
 msgid "Do you accept this request on account %s?"
-msgstr "Akzeptieren Sie diese Anfrage vom %s Konto?"
+msgstr "Akzeptieren Sie diese Anfrage vom Konto %s?"
 
-#: ../src/gajim.py:583
+#: ../src/gajim.py:551
 #, 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:631
-#: ../src/notify.py:492
-#: ../src/osx/growler.py:17
+#: ../src/gajim.py:602 ../src/notify.py:522 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/gajim.py:934
-#: ../src/gajim.py:938
+#: ../src/gajim.py:926 ../src/gajim.py:930
 #, 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:948
-#: ../src/gajim.py:962
+#: ../src/gajim.py:940 ../src/gajim.py:954
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:994
+#: ../src/gajim.py:977 ../src/notify.py:524
+msgid "Subscription request"
+msgstr "Abonnementanfrage"
+
+#: ../src/gajim.py:1002
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:1003
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakt \"%s\" hat Sie autorisiert seinen oder ihren Staus zu sehen."
+msgstr "\"%s\" hat Sie autorisiert, seinen Status zu sehen."
 
-#: ../src/gajim.py:1014
+#: ../src/gajim.py:1015
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
+msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gajim.py:1015
+#: ../src/gajim.py:1016
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
-"Sie werden sie oder ihn immer als offline sehen.\n"
-"Möchten Sie sie oder ihn von Ihrer Kontaktliste entfernen?"
+"Er wird Ihnen von nun an als offline angezeigt.\n"
+"Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
 
-#: ../src/gajim.py:1056
+#: ../src/gajim.py:1041 ../src/notify.py:526
+msgid "Unsubscribed"
+msgstr "Abbestellt"
+
+#: ../src/gajim.py:1082
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
+msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gajim.py:1232
-#: ../src/groupchat_control.py:1165
+#: ../src/gajim.py:1271 ../src/groupchat_control.py:1166
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s heißt jetzt %(new_nick)s"
 
-#: ../src/gajim.py:1250
-#: ../src/groupchat_control.py:1340
-#: ../src/history_window.py:428
-#: ../src/notify.py:232
+#: ../src/gajim.py:1289 ../src/groupchat_control.py:1341
+#: ../src/history_window.py:428 ../src/notify.py:248
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s"
 
-#: ../src/gajim.py:1313
+#: ../src/gajim.py:1356
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s hat den Betreff in %(subject)s geändert"
+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:1377
-#: ../src/groupchat_control.py:1125
+#: ../src/gajim.py:1420 ../src/groupchat_control.py:1126
 msgid "Any occupant is allowed to see your full JID"
-msgstr "Jeder Teilnehmer darf Ihre volle JID sehen"
+msgstr "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1423
 msgid "Room now shows unavailable member"
-msgstr "Raum zeigt jetzt abwesende Teilnehmer"
+msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
 
-#: ../src/gajim.py:1382
+#: ../src/gajim.py:1425
 msgid "room now does not show unavailable members"
-msgstr "Raum zeigt jetzt abwesende Teilnehmer nicht an"
+msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1428
 msgid "A non-privacy-related room configuration change has occurred"
-msgstr "Eine nicht Privatsphären-bezogene Raum-Konfigurations-Änderung ist aufgetreten"
+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:1388
+#: ../src/gajim.py:1431
 msgid "Room logging is now enabled"
-msgstr "Raum-Mitschnitt ist jetzt aktiviert"
+msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1433
 msgid "Room logging is now disabled"
-msgstr "Raum-Mitschnitt ist jetzt deaktiviert"
+msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
 
-#: ../src/gajim.py:1392
+#: ../src/gajim.py:1435
 msgid "Room is now non-anonymous"
-msgstr "Raum ist jetzt nicht anonym"
+msgstr "Der Chatraum ist jetzt nicht mehr anonym"
 
-#: ../src/gajim.py:1395
+#: ../src/gajim.py:1438
 msgid "Room is now semi-anonymous"
-msgstr "Raum ist jetzt halb anonym"
+msgstr "Der Chatraum ist jetzt semi-anonym"
 
-#: ../src/gajim.py:1398
+#: ../src/gajim.py:1441
 msgid "Room is now fully-anonymous"
-msgstr "Raum ist jetzt voll anonym"
+msgstr "Der Chatraum ist jetzt komplett anonym"
 
-#: ../src/gajim.py:1430
+#: ../src/gajim.py:1473
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
-msgstr "Für das Betreten des Gruppenchats-Raumes %s wird ein Passwort benötigt."
+msgstr "Für das Betreten des Chatraumes %s wird ein Passwort benötigt."
 
-#: ../src/gajim.py:1464
-msgid "You configured Gajim to use GPG agent, but there is no GPG agent running or it returned a wrong passphrase.\n"
-msgstr "Du hast Gajim für die Verwendung des GPG-Agenten konfiguriert, aber es läuft kein GPG-Agent oder er gab eine falsche Passphrase zurück.\n"
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gajim.py:1507
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Sie haben Gajim für die Verwendung des GPG-Agenten konfiguriert, es läuft "
+"jedoch kein GPG-Agent oder er gab eine falsche Passphrase zurück.\n"
 
-#: ../src/gajim.py:1466
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gajim.py:1509
 msgid "You are currently connected without your OpenPGP key."
-msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
+msgstr "Sie wurden ohne Ihren GPG-Schlüssel verbunden"
 
-#: ../src/gajim.py:1469
+#: ../src/gajim.py:1512
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gajim.py:1571
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gajim.py:1535
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG ist nicht benutzbar"
+
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gajim.py:1535
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht "
+"verschlüsselt werden."
+
+#: ../src/gajim.py:1537 ../src/gajim.py:2184 ../src/gajim.py:2219
+#: ../src/groupchat_control.py:1849 ../src/roster_window.py:3827
+msgid "Do _not ask me again"
+msgstr "_Nicht noch einmal fragen"
+
+#: ../src/gajim.py:1545
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring ist installiert, wurde aber nicht \t\t\t\t\t\t\tkorrekt "
+"gestartet (die Umgebungsvariablen sind möglicherweise nicht \t\t\t\t\t\t"
+"\tkorrekt gesetzt gesetzt)"
+
+#: ../src/gajim.py:1652
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
-msgstr "Neue E-Mail auf %(gmail_mail_address)s"
+msgstr "Neue E-Mail über %(gmail_mail_address)s empfangen"
 
-#: ../src/gajim.py:1573
+#: ../src/gajim.py:1654
 #, 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-Nachricht"
-msgstr[1] "Sie haben %d ungelesene E-Mail-Nachrichten"
+msgstr[0] "Sie haben %d ungelesene E-Mail"
+msgstr[1] "Sie haben %d ungelesene E-Mails"
 
-#: ../src/gajim.py:1586
+#: ../src/gajim.py:1667
 #, python-format
 msgid ""
 "\n"
@@ -7393,581 +8027,624 @@
 "Betreff: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1657
+#: ../src/gajim.py:1738
 #, python-format
 msgid "%s wants to send you a file."
-msgstr "%s möchte ihnen eine Datei senden."
+msgstr "%s möchte Ihnen eine Datei senden."
 
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1806
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Sie haben %(filename)s erfolgreich von %(name)s erhalten."
+msgstr "Die Übermittlung der Datei %(filename)s von %(name)s war erfolgreich."
 
 #. ft stopped
-#: ../src/gajim.py:1729
+#: ../src/gajim.py:1810
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Dateiübertragung %(filename)s von %(name)s wurde gestoppt."
+msgstr ""
+"Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1742
+#: ../src/gajim.py:1823
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Sie haben %(filename)s erfolgreich an %(name)s gesendet."
+msgstr "Sie haben die Datei %(filename)s erfolgreich an %(name)s gesendet."
 
 #. ft stopped
-#: ../src/gajim.py:1746
+#: ../src/gajim.py:1827
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
+msgstr "Die Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1834
+#: ../src/gajim.py:1924
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
-"Nicht möglich die Nachricht von %s zu entschlüsseln\n"
-"Eventuell wurde diese verändert."
+"Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
+"Eventuell wurde sie verändert."
 
-#: ../src/gajim.py:1841
+#: ../src/gajim.py:1931
 msgid "Unable to decrypt message"
-msgstr "Unmöglich Nachricht zu entschlüsseln"
+msgstr "Die Nachricht konnte nicht entschlüsselt werden"
 
-#: ../src/gajim.py:1912
+#: ../src/gajim.py:2005
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: ../src/gajim.py:1913
+#: ../src/gajim.py:2006
 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:1925
+#: ../src/gajim.py:2018
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2031
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1949
+#: ../src/gajim.py:2042
 msgid "Error."
 msgstr "Fehler:"
 
-#: ../src/gajim.py:1974
+#: ../src/gajim.py:2067
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../src/gajim.py:1975
-msgid "You are already connected to this account with the same resource. Please type a new one"
-msgstr "Sie sind mit diesem Konto bereits mit derselben Ressource verbunden. Bitte geben Sie eine neue Ressource ein"
+#: ../src/gajim.py:2068
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Sie sind mit diesem Konto bereits mit derselben Ressource verbunden. Bitte "
+"geben Sie eine neue Ressource ein"
 
-#: ../src/gajim.py:2028
+#: ../src/gajim.py:2123
 msgid "Error verifying SSL certificate"
 msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
 
-#: ../src/gajim.py:2029
+#: ../src/gajim.py:2124
 #, python-format
 msgid ""
-"There was an error verifying the SSL certificate of your jabber server: %(error)s\n"
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
 "Do you still want to connect to this server?"
 msgstr ""
-"Es trat ein Fehler bei der Überprüfung des SSL-Zertifikats Ihres Jabber-Servers auf: %(error)s\n"
-"Möchten Sie dennoch zum Server verbinden?"
+"Es trat ein Fehler bei der Überprüfung des SSL-Zertifikats Ihres Jabber-"
+"Servers auf: %(error)s\n"
+"Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2129
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriere den Fehler für dieses Zertifikat."
 
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2149
 msgid "SSL certificate error"
 msgstr "SSL-Zertifikat-Fehler"
 
-#: ../src/gajim.py:2050
+# FIXME: Check English. Should be:
+# your connection has been hacked.
+#: ../src/gajim.py:2150
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
-"Das SSL-Zertifikat scheint sich geändert zu haben oder die Verbindung wurde gehackt.\n"
-"Alter Fingerprint: %(old)s\n"
-"Neuer Fingerprint: %(new)s\n"
+"Das SSL-Zertifikat %(account)s scheint sich geändert zu haben oder die Verbindung wurde "
+"angegriffen.\n"
+"Alter Fingerabdruck: %(old)s\n"
+"Neuer Fingerabdruck: %(new)s\n"
 "\n"
-"Möchten Sie dennoch verbinden und den Fingerprint des Zertifikats aktualisieren?"
+"Möchten Sie sich dennoch verbinden und den Fingerabdruck des Zertifikats "
+"aktualisieren?"
 
-#: ../src/gajim.py:2072
-#: ../src/gajim.py:2102
+#: ../src/gajim.py:2180 ../src/gajim.py:2215
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: ../src/gajim.py:2073
-msgid "You are about to send your password on an unencrypted connection. Are you sure you want to do that?"
-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:2181
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+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:2075
-#: ../src/gajim.py:2105
+#: ../src/gajim.py:2183 ../src/gajim.py:2218
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
 
-#: ../src/gajim.py:2076
-#: ../src/gajim.py:2106
-#: ../src/groupchat_control.py:1844
-#: ../src/roster_window.py:3769
-msgid "Do _not ask me again"
-msgstr "_Nicht noch einmal fragen"
+#: ../src/gajim.py:2216
+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 ""
+"Sie sind dabei, Ihr Passwort über eine unsichere Verbindung zu senden. Sind "
+"Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
+"installieren, um dieses Problem zu beheben.)"
 
-#: ../src/gajim.py:2103
-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 "Sie sind dabei Ihr Passwort über eine unsichere Verbindung zu senden. Es ist ratsam PyOpenSSL zu installieren um dies zu beheben. Sind Sie sicher, dass Sie dies tun möchten?"
-
-#: ../src/gajim.py:2120
+#: ../src/gajim.py:2236
 msgid "PEP node was not removed"
-msgstr "PEP Knoten wurde nicht entfernt"
+msgstr "PEP-Knoten wurde nicht entfernt"
 
-#: ../src/gajim.py:2121
+#: ../src/gajim.py:2237
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP Knoten %(node)s wurde nicht entfernt: %(message)s"
+msgstr "Der PEP-Knoten %(node)s wurde nicht entfernt: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2589
-#: ../src/gajim.py:2611
+#: ../src/gajim.py:2723 ../src/gajim.py:2745
 msgid "Emoticons disabled"
 msgstr "Emoticons deaktiviert"
 
-#: ../src/gajim.py:2590
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
-msgstr "Das konfigurierte Emoticon-Thema wurde nicht gefunden. Emoticans sind deaktiviert."
+#: ../src/gajim.py:2724
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind "
+"deaktiviert."
 
-#: ../src/gajim.py:2612
-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 "Ihr konfiguriertes Emoticon-Thema kann nicht geladen werden. Sie müssen eventuell das Format der Datei emoticons.py aktualisieren. Besuchen Sie http://trac.gajim.org/wiki/Emoticons für mehr Informationen."
+#: ../src/gajim.py:2746
+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 ""
+"Ihr konfiguriertes Emoticon-Set kann nicht geladen werden. Sie müssen "
+"eventuell das Format der Datei emoticons.py aktualisieren. Besuchen Sie "
+"http://trac.gajim.org/wiki/Emoticons (Englisch) für mehr Informationen."
 
-#: ../src/gajim.py:2638
-#: ../src/roster_window.py:3303
+#: ../src/gajim.py:2772 ../src/roster_window.py:3315
 msgid "You cannot join a group chat while you are invisible"
-msgstr "Sie können einem Gruppenchat nicht beitreten, wenn Sie unsichtbar sind."
+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:2917
+#: ../src/gajim.py:3050
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gajim.py:3014
+#: ../src/gajim.py:3147
 msgid "Bookmark already set"
-msgstr "Lesezeichen existiert schon"
+msgstr "Chatraum ist bereits gespeichert"
 
-#: ../src/gajim.py:3015
+#: ../src/gajim.py:3148
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Der Gruppenchat \"%s\" ist schon in den Lesezeichen."
+msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
 
-#: ../src/gajim.py:3028
+#: ../src/gajim.py:3161
 msgid "Bookmark has been added successfully"
-msgstr "Lesezeichen wurde erfolgreich hinzugefügt"
+msgstr "Chatraum wurde erfolgreich gespeichert"
 
-#: ../src/gajim.py:3029
+#: ../src/gajim.py:3162
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Sie können ihre Lesezeichen über das Aktionen-Menü in der Kontaktliste bearbeiten"
+msgstr ""
+"Sie können die gespeicherten Chaträume über das Aktionen-Menü in der "
+"Kontaktliste bearbeiten"
 
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:81
 msgid "Shows a help on specific command"
-msgstr "zeige die Hilfe für einen bestimmten Befehl"
+msgstr "Zeigt die Hilfe für einen bestimmten Befehl"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:84
 msgid "command"
 msgstr "Befehl"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:85
 msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Zeige Popup-Fenster mit dem nächsten ungelesenen Ereignis"
 
-#: ../src/gajim-remote.py:95
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Gibt eine Liste aller Kontakte in der Kontaktliste aus. Eine Zeile je Kontakt"
+#: ../src/gajim-remote.py:97
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Gibt eine Liste aller Kontakte in der Kontaktliste aus. Eine Zeile je Kontakt"
 
-#: ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219
-#: ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233
-#: ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../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:272
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:100
 msgid "show only contacts of the given account"
 msgstr "zeige nur Kontakte für das gegebene Konto"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:106
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:110
 msgid "Changes the status of account or accounts"
-msgstr "Ändere den Status eines oder mehrerer Konten"
+msgstr "Ändert den Status eines oder mehrerer Konten"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "Status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "Eins von: offline, online, chat, away, xa, dnd, invisible "
+msgstr "Mögliche Werte: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:160
 msgid "message"
 msgstr "Nachricht"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: ../src/gajim-remote.py:113
-msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
-msgstr "Ändere Status vom Konto \"account\". Falls nicht angegeben, ändere Status aller Konten für die \"Kontostatus mit globalem Status abgleichen\" aktiviert ist"
+#: ../src/gajim-remote.py:115
+msgid ""
+"change status of account \"account\". If not specified, try to 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:119
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
-msgstr "Zeige Chatfenster, so dass eine Nachricht an einen Kontakt gesendet werden kann"
+msgstr ""
+"Zeige Chatfenster, sodass eine Nachricht an einen Kontakt gesendet werden "
+"kann"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
-msgstr "JID des Kontakts mit Sie chatten möchten"
+msgstr "Jabber-ID des Kontakts, mit dem Sie chatten möchten"
 
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:212
 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:128
-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 key', just set 'OpenPGP key' to ''."
-msgstr "Sende neue Chat-Nachricht zu einem Kontakt in der Kontaktliste. OpenPGP-Schlüssel und Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-Schlüssel, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
+#: ../src/gajim-remote.py:130
+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 "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Sendet eine Nachricht an einen Kontakt in der Kontaktliste. OpenPGP-"
+"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:132
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
-msgstr "JID des Kontakts, der die Nachricht empfängt"
+msgstr "Jabber-ID des Kontakts, der die Nachricht empfangen soll"
 
-#: ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
-#: ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "PGP-Schlüssel"
 
-#: ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 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:136
-#: ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 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:141
-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 key', just set 'OpenPGP key' to ''."
-msgstr "Sende neue einzelne Nachricht an einen Kontakt in der Kontaktliste. OpenPGP-Schlüssel und Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-Schlüssel, lassen Sie 'OpenGPG-Schlüssel' einfach leer."
+#: ../src/gajim-remote.py:143
+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 "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Sendet eine Nachricht an einen Kontakt in der Kontaktliste. OpenPGP-"
+"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:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "Betreff"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "Nachrichten-Betreff"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
-msgstr "Sendet eine neue Nachricht an einen Gruppenchat, den Sie betreten haben."
+msgstr "Sendet eine neue Nachricht an einen Chatraum, den Sie betreten haben."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
-msgstr "JID des Raums, der die Nachricht empfängt"
+msgstr "Jabber-ID des Chatraums, der die Nachricht empfangen soll"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
-msgstr "Zeige detaillierte Informationen über Kontakt"
+msgstr "Zeige detaillierte Informationen über einen Kontakt"
 
-#: ../src/gajim-remote.py:166
-#: ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
-msgstr "JID des Kontakts"
+msgstr "Jabber-ID des Kontakts"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über ein Konto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Name des Kontos"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "Datei"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Dateipfad"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "Wenn angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
-msgstr "Zeige alle Einstellung und ihre Werte"
+msgstr "Zeigt alle Einstellungen und ihre Werte"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
-msgstr "Setze Wert von 'Schlüssel' auf 'Wert'."
+msgstr "Setzt den Wert von 'Schlüssel' auf 'Wert'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
-msgstr "'Schlüssel' ist der Name der Option, 'Wert' ist der der einzustellende Wert"
+msgstr ""
+"'Schlüssel' ist der Name der Einstellung, 'Wert' ist der der einzustellende "
+"Wert"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
-msgstr "Lösche eine Einstellung"
+msgstr "Löscht eine Einstellung"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "Schlüssel"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Schreibe die aktuellen Gajim-Einstellung in die Konfigurationsdatei"
+msgstr "Schreibt die aktuellen Gajim-Einstellungen in die Konfigurationsdatei"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus der Kontaktliste"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
-msgstr "Fügt Kontakt zur Kontaktliste hinzu"
+msgstr "Fügt den Kontakt der Kontaktliste hinzu"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
-msgstr "JID"
+msgstr "Jabber-ID"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
-msgstr "Fügt neuen Kontakt zu diesem Konto hinzu"
+msgstr "Fügt einen neuen Kontakt zu diesem Konto hinzu"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Gibt derzeitigen Status zurück (der globale Status, außer, es wird ein Account spezifiziert)"
+msgstr ""
+"Gibt den derzeitigen Status zurück (den globalen Status, es sei denn, es "
+"wird ein Konto angegeben)"
 
-#: ../src/gajim-remote.py:231
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Gibt derzeitige Statusnachricht zurück (der globale, außer, es wird ein Account angegeben)"
+#: ../src/gajim-remote.py:233
+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:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Gibt die Anzahl der ungelesenen Nachrichten zurück"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
-msgstr "Öffnet den 'Chat starten' Dialog"
+msgstr "Öffnet den Dialog zum Beginnen eines Chats"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
-msgstr "Starte Chat mit diesem Account"
+msgstr "Startet einen Chat über dieses Konto"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Benutzerdefinierten XML-Code senden"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "Zu sendender XML-Code"
 
-#: ../src/gajim-remote.py:251
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "Konto, an welchen XML gesendet wird; wenn nicht spezifiziert, wird XML an alle Konten gesendet"
+#: ../src/gajim-remote.py:253
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
+"der XML-Code an alle Konten gesendet"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
-msgstr "Behandle eine xmpp:/ URI"
+msgstr "Verarbeite einen xmpp:/-URI"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
-msgstr "Zu verarbeitende URI"
+msgstr "Zu verarbeitender URI"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
-msgstr "Konto mit welchem Sie dies bedienen möchten"
+msgstr "Konto, mit dem er verarbeitet werden soll"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:267
 msgid "Join a MUC room"
-msgstr "Neuen Raum betreten"
+msgstr "Neuen Chatraum betreten"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:269
 msgid "room"
-msgstr "Raum"
+msgstr "Chatraum"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:269
 msgid "Room JID"
-msgstr "Raum-JID"
+msgstr "Jabber-ID des Chatraums"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:270
 msgid "nick"
 msgstr "Spitzname"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:270
 msgid "Nickname to use"
-msgstr "Spitzname, welcher benutzt werden soll"
+msgstr "Spitzname, der benutzt werden soll"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:271
 msgid "password"
 msgstr "Passwort"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:271
 msgid "Password to enter the room"
-msgstr "Passwörter um den Raum zu betreten"
+msgstr "Das Passwort, um den Chatraum zu betreten"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:272
 msgid "Account from which you want to enter the room"
-msgstr "Konto, mit dem Sie den Raum betreten möchten"
+msgstr "Das Konto, mit dem Sie den Chatraum betreten möchten"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:277
 msgid "Check if Gajim is running"
 msgstr "Bitte überprüfen Sie, ob Gajim läuft"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:281
 msgid "Shows or hides the ipython window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:308
 msgid "Missing argument \"contact_jid\""
-msgstr "Fehlendes Argument \"contact_jid\""
+msgstr "Fehlendes Argument \"contact_Jabber-ID\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:327
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
-"'%s' ist nicht in ihrer Kontaktliste.\n"
+"'%s' ist nicht in Ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:330
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:382
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr "Gajim scheint nicht gestartet zu sein. gajim-remote kann somit nicht genutzt werden."
+msgstr ""
+"Gajim scheint nicht gestartet zu sein, daher kann gajim-remote nicht genutzt "
+"werden."
 
-#: ../src/gajim-remote.py:403
+#: ../src/gajim-remote.py:405
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
-"Benutzung: %(basename)s %(command)s %(arguments)s \n"
+"Verwendung: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:407
+#: ../src/gajim-remote.py:409
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:411
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:415
+#: ../src/gajim-remote.py:417
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
-"Befehl ist einer von:\n"
+"Der Befehl ist einer von:\n"
 
-#: ../src/gajim-remote.py:480
+#: ../src/gajim-remote.py:482
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
-"Zu viele Argumente. \n"
-"Geben Sie \"%(basename)s help %(command)s\" für weitere Informationen ein"
+"Zu viele Argumente.\n"
+"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
+"erhalten"
 
-#: ../src/gajim-remote.py:485
+#: ../src/gajim-remote.py:487
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argument \"%(arg)s\" wurde nicht definiert. \n"
-"Geben Sie \"%(basename)s help  %(command)s\" für weitere Informationen ein"
+"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
+"erhalten"
 
-#: ../src/gajim-remote.py:504
+#: ../src/gajim-remote.py:506
 msgid "Wrong uri"
 msgstr "Falscher URI"
 
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
-msgstr "Thema"
+msgstr "Design"
 
 #: ../src/gajim_themes_window.py:97
 msgid "You cannot make changes to the default theme"
-msgstr "Sie können ihr derzeitiges Theme nicht ändern"
+msgstr "Sie können das derzeitige Design nicht ändern"
 
 #: ../src/gajim_themes_window.py:98
 msgid "Please create a clean new theme with your desired name."
-msgstr "Bitte erstellen Sie ein neues leeres Thema mit Ihrem gewünschten Namen."
+msgstr "Bitte erstellen Sie ein neues leeres Design mit dem gewünschten Namen."
 
 #. don't confuse translators
 #: ../src/gajim_themes_window.py:172
@@ -7976,11 +8653,12 @@
 
 #: ../src/gajim_themes_window.py:189
 msgid "You cannot delete your current theme"
-msgstr "Sie können ihr derzeitiges Theme nicht löschen"
+msgstr "Sie können Ihr derzeitiges Design nicht löschen"
 
 #: ../src/gajim_themes_window.py:190
 msgid "Please first choose another for your current theme."
-msgstr "Bitte wählen Sie zuerst einen anderen Namen für ihr derzeitiges Theme."
+msgstr ""
+"Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
 
 #: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
@@ -7990,7 +8668,9 @@
 #: ../src/groupchat_control.py:154
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
-msgstr "Sie sind nicht mehr im Gruppenchat \"%(room)s\" oder \"%(nick)s\" hat den Gruppenchat verlassen."
+msgstr ""
+"Entweder sind Sie nicht mehr im Chatraum \"%(room)s\" oder \"%(nick)s\" hat "
+"den Chatraum verlassen."
 
 #: ../src/groupchat_control.py:453
 msgid "Insert Nickname"
@@ -8004,239 +8684,285 @@
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1014
 msgid "Really send file?"
 msgstr "Datei wirklich senden?"
 
-#: ../src/groupchat_control.py:1029
+#: ../src/groupchat_control.py:1015
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Wenn Sie eine Datei an %s senden wird er/sie Ihre echte Jabber-ID kennen."
+msgstr ""
+"Wenn Sie eine Datei an %s senden, wird der Kontakt Ihre echte Jabber-ID "
+"kennen."
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1128
+#: ../src/groupchat_control.py:1129
 msgid "Room logging is enabled"
-msgstr "Raum-Mitschnitt ist aktiviert"
+msgstr "Chatraum-Aufzeichnung ist aktiviert"
 
-#: ../src/groupchat_control.py:1130
+#: ../src/groupchat_control.py:1131
 msgid "A new room has been created"
-msgstr "Ein neuer Raum wurde erstellt"
+msgstr "Ein neuer Chatraum wurde erstellt"
 
-#: ../src/groupchat_control.py:1133
+#: ../src/groupchat_control.py:1134
 msgid "The server has assigned or modified your roomnick"
-msgstr "Der Server hat Ihren Raum-Nick zugewiesen oder verändert"
+msgstr "Der Server hat Ihren Chatraum-Nick zugewiesen oder verändert"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1140
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
-msgstr "%(nick)s wurde rausgeworfen: %(reason)s"
+msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1144
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
-msgstr "%(nick)s wurde von %(who)s rausgeworfen: %(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:1150
+#: ../src/groupchat_control.py:1151
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
-msgstr "%(nick)s wurde gebannt: %(reason)s"
+msgstr "%(nick)s wurde gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1155
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
-msgstr "%(nick)s wurde von %(who)s gebannt: %(reason)s"
+msgstr "%(nick)s wurde von %(who)s gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1164
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:1201
-#: ../src/groupchat_control.py:1205
-#: ../src/groupchat_control.py:1210
+#: ../src/groupchat_control.py:1202 ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1211
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
-msgstr "%(nick)s wurde aus dem Raum geworfen: %(reason)s"
+msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1202
+#: ../src/groupchat_control.py:1203
 msgid "affiliation changed"
-msgstr "Zugehörigkeit geändert: "
+msgstr "Zugehörigkeit geändert:"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1208
 msgid "room configuration changed to members-only"
-msgstr "Gruppenchatkonfiguration wurde auf ausschließlich Mitgleider geändert"
+msgstr ""
+"Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1213
 msgid "system shutdown"
-msgstr "System wird heruntergefahren"
+msgstr "Computer wird heruntergefahren"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1282
 #, 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"
+msgstr ""
+"** Mitgliedschaft von %(nick)s wurde von %(actor)s auf %(affiliation)s "
+"gesetzt"
 
-#: ../src/groupchat_control.py:1285
+#: ../src/groupchat_control.py:1286
 #, 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:1300
+#: ../src/groupchat_control.py:1301
 #, 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:1304
+#: ../src/groupchat_control.py:1305
 #, 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:1333
+#: ../src/groupchat_control.py:1334
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:1338
+#: ../src/groupchat_control.py:1339
 #, python-format
 msgid "%s has joined the group chat"
-msgstr "%s hat den Gruppenchat betreten"
+msgstr "%s hat den Chatraum betreten"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
+#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1737
 msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/groupchat_control.py:1477
-#: ../src/groupchat_control.py:1495
-#: ../src/groupchat_control.py:1579
-#: ../src/groupchat_control.py:1596
+#: ../src/groupchat_control.py:1478 ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1582 ../src/groupchat_control.py:1599
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Spitzname nicht gefunden: %s"
 
-#: ../src/groupchat_control.py:1511
+#: ../src/groupchat_control.py:1512
 msgid "This group chat has no subject"
-msgstr "Dieser Gruppenchat hat kein Thema"
+msgstr "Dieser Chatraum hat kein Thema"
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1524
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
 
-#: ../src/groupchat_control.py:1657
+#: ../src/groupchat_control.py:1660
 #, 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. Does NOT support spaces in nickname."
-msgstr "Benutzung: /%s <Spitzname|JID> [Grund], bannt die JID aus dem Gruppenchat. Der Spitzname eines Teilnehmers kann hinzugefügt werden, aber nicht, wenn es ein \"@\" enthält. Wenn die JID derzeit im Gruppenchat ist, wird er/sie/es ebenfalls gebannt. Unterstützt KEINE Leerzeichen im Spitznamen."
+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. Does "
+"NOT support spaces in nickname."
+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:1664
+#: ../src/groupchat_control.py:1667
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-msgstr "Benutzung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit dem Inhaber des angegebenen Spitznamens."
+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:1670
+#: ../src/groupchat_control.py:1673
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Benutzung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige eines Grundes, falls angegeben."
+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:1676
+#: ../src/groupchat_control.py:1679
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Benutzung: /%s <JID> [Grund], lädt die JID in den aktuellen Gruppenchat ein, 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."
 
-#: ../src/groupchat_control.py:1680
+#: ../src/groupchat_control.py:1683
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room at server optionally using specified nickname."
-msgstr "Benutzung: /%s <Raum>@<Server> [/Spitzname], bietet den Beitritt zu Raum at Server an, optional mit Spitznamen."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room at server optionally "
+"using specified nickname."
+msgstr ""
+"Verwendung: /%s <Chatraum>@<Server> [/Spitzname], bietet den Beitritt zu "
+"Chatraum at Server an, optional mit Spitznamen."
 
-#: ../src/groupchat_control.py:1684
+#: ../src/groupchat_control.py:1687
 #, python-format
-msgid "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."
-msgstr "Benutzung: /%s <Spitzname> [Grund], verweist den Inhaber des Spitznamen des Gruppenchats und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen im Spitznamen."
+msgid ""
+"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."
+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:1693
+#: ../src/groupchat_control.py:1696
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-msgstr "Benutzung: /%s <Spitzname> [Nachricht], öffnet ein privates Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen Spitznamens."
+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:1698
+#: ../src/groupchat_control.py:1701
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Benutzung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Gruppenchat."
+msgstr ""
+"Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
 
-#: ../src/groupchat_control.py:1702
+#: ../src/groupchat_control.py:1705
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
-msgstr "Benutzung: /%s , zeigt die Namen der Gruppenchatbesucher."
+msgstr "Verwendung: /%s, zeigt die Namen der Teilnehmer im Chatraum an."
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1709
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Benutzung: /%s [topic], zeigt oder aktualisiert das derzeitige Gruppenchat-Thema."
+msgstr ""
+"Verwendung: /%s [topic], zeigt oder aktualisiert das derzeitige Chatraum-"
+"Thema."
 
-#: ../src/groupchat_control.py:1709
+#: ../src/groupchat_control.py:1712
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Benutzung: /%s <Nachricht>, sendet eine Nachricht ohne andere Befehle zu beachten."
+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:1838
+#: ../src/groupchat_control.py:1843
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
-msgstr "Möchten Sie den Gruppenchat \"%s\" wirklich verlassen?"
+msgstr "Möchten Sie den Chatraum \"%s\" wirklich verlassen?"
 
-#: ../src/groupchat_control.py:1840
-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 Gruppenchat geschlossen."
+#: ../src/groupchat_control.py:1845
+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:1877
+#: ../src/groupchat_control.py:1882
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1878
+#: ../src/groupchat_control.py:1883
 msgid "Please specify the new subject:"
-msgstr "Bitte bestimmen Sie ein neues Thema"
+msgstr "Bitte wählen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1887
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1883
+#: ../src/groupchat_control.py:1888
 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:1909
+#: ../src/groupchat_control.py:1915
 #, python-format
 msgid "Destroying %s"
-msgstr "Zerstöre %s"
+msgstr "Lösche %s"
 
-#: ../src/groupchat_control.py:1910
+#: ../src/groupchat_control.py:1916
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
-"Sie werden den Raum endgültig zerstören.\n"
+"Der Chatraum wird endgültig gelöscht.\n"
 "Sie können hier einen Grund angeben:"
 
-#: ../src/groupchat_control.py:1912
+#: ../src/groupchat_control.py:1918
 msgid "You may also enter an alternate venue:"
-msgstr "Sie können auch einen alternativen Raum eintragen:"
+msgstr "Sie können auch einen alternativen Chatraum eintragen:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2089
 #, python-format
 msgid "Kicking %s"
-msgstr "%s rausschmeißen"
+msgstr "%s rauswerfen"
 
-#: ../src/groupchat_control.py:2084
-#: ../src/groupchat_control.py:2376
+#: ../src/groupchat_control.py:2090 ../src/groupchat_control.py:2381
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2375
+#: ../src/groupchat_control.py:2380
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -8246,20 +8972,23 @@
 msgstr "Es wurde ein Programmfehler entdeckt"
 
 #: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Es ist vermutlich nicht fatal, aber der Fehler sollte trotzdem den Entwicklern gemeldet werden"
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Der Fehler ist vermutlich nicht fatal, sollte aber trotzdem den Entwicklern "
+"gemeldet werden."
 
 #: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
-msgstr "Bug melden"
+msgstr "Fehler melden"
 
 #: ../src/gtkexcepthook.py:77
 msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:166
-#: ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
@@ -8277,7 +9006,9 @@
 #: ../src/gtkgui_helpers.py:396
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr "Konnte nicht an %s schreiben. Sitzungmanagment-Unterstützung wird nicht funktionieren"
+msgstr ""
+"Konnte nicht an %s schreiben. Die Sitzungmanagment-Unterstützung wird nicht "
+"funktionieren"
 
 #. xmpp: is currently handled by another program, so ask the user
 #: ../src/gtkgui_helpers.py:733
@@ -8290,7 +9021,8 @@
 
 #: ../src/gtkgui_helpers.py:735
 msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Immer beim Programmstart prüfen, ob Gajim der Standard-Jabber-Client ist"
+msgstr ""
+"Immer beim Programmstart prüfen, ob Gajim der Standard-Jabber-Client ist"
 
 #: ../src/gtkgui_helpers.py:804
 msgid "Extension not supported"
@@ -8299,76 +9031,82 @@
 #: ../src/gtkgui_helpers.py:805
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Bild kann nicht im %(type)s-Format gespeichert werden. Als %(new_filename)s speichern?"
+msgstr ""
+"Bild kann nicht im %(type)s-Format gespeichert werden. Als %(new_filename)s "
+"speichern?"
 
 #: ../src/gtkgui_helpers.py:840
 msgid "Save Image as..."
-msgstr "Bild speichern unter ..."
+msgstr "Bild speichern unter …"
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:96
 msgid "Cannot find history logs database"
 msgstr "Kann Verlaufs-Datenkbank nicht finden"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:136
 msgid "Contacts"
 msgstr "Kontakte"
 
 #. holds time
-#: ../src/history_manager.py:150
-#: ../src/history_manager.py:190
+#: ../src/history_manager.py:149 ../src/history_manager.py:189
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:156
-#: ../src/history_manager.py:208
+#: ../src/history_manager.py:155 ../src/history_manager.py:207
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. holds message
-#: ../src/history_manager.py:164
-#: ../src/history_manager.py:196
+#: ../src/history_manager.py:163 ../src/history_manager.py:195
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../src/history_manager.py:224
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Möchten Sie die Datenbank aufräumen? (NICHT EMPFOHLEN, WENN GAJIM GERADE LÄUFT)"
+#: ../src/history_manager.py:223
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Möchten Sie die Datenbank aufräumen? (NICHT EMPFOHLEN, WENN GAJIM GERADE "
+"LÄUFT)"
 
-#: ../src/history_manager.py:226
+#: ../src/history_manager.py:225
 msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Der reservierte Datenbankspeicherplatz wird nicht freigegeben, er wird nur wiederverwendbar. Wenn Sie wirklich den Speicherplatz reduzieren möchten, klicken Sie JA, ansonsten NEIN.\n"
+"Der reservierte Datenbankspeicherplatz wird nicht freigegeben, er wird nur "
+"wiederverwendbar. Wenn Sie den Speicherplatz wirklich reduzieren möchten, "
+"klicken Sie JA, ansonsten NEIN.\n"
 "\n"
-"Falls Sie JA klicken, warten Sie bitte einen Augenblick ..."
+"Falls Sie JA klicken, warten Sie danach bitte einen Augenblick …"
 
-#: ../src/history_manager.py:434
+#: ../src/history_manager.py:433
 msgid "Exporting History Logs..."
-msgstr "Exportiere Verlauf ..."
+msgstr "Exportiere Verlauf …"
 
-#: ../src/history_manager.py:509
+#: ../src/history_manager.py:508
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s sagte um %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:546
+#: ../src/history_manager.py:545
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Möchten Sie wirklich alle Logs des ausgewählten Kontakts löschen?"
 msgstr[1] "Möchten Sie wirklich alle Logs der ausgewählten Kontakte löschen?"
 
-#: ../src/history_manager.py:550
-#: ../src/history_manager.py:585
+#: ../src/history_manager.py:549 ../src/history_manager.py:584
 msgid "This is an irreversible operation."
 msgstr "Dies ist ein unwiderruflicher Vorgang."
 
-#: ../src/history_manager.py:582
+#: ../src/history_manager.py:581
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
@@ -8391,19 +9129,18 @@
 #: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
-msgstr "Status ist jetzt: %(status)s: %(status_msg)s"
+msgstr "Der Status ist jetzt: %(status)s: %(status_msg)s"
 
 #: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
-msgstr "Status ist jetzt: %(status)s"
+msgstr "Der Status ist jetzt: %(status)s"
 
-#: ../src/htmltextview.py:591
-#: ../src/htmltextview.py:602
+#: ../src/htmltextview.py:564 ../src/htmltextview.py:575
 msgid "Timeout loading image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:585
 msgid "Image is too big"
 msgstr "Das Bild ist zu groß"
 
@@ -8413,7 +9150,7 @@
 
 #: ../src/message_window.py:435
 msgid "Group Chats"
-msgstr "Gruppenchat"
+msgstr "Chatraum"
 
 #: ../src/message_window.py:437
 msgid "Private Chats"
@@ -8431,70 +9168,70 @@
 msgid "- messages will not be logged"
 msgstr "- Nachrichten werden nicht aufgezeichnet"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:246
 #, python-format
 msgid "%(nick)s Changed Status"
-msgstr "%(nick)s änderte Status"
+msgstr "%(nick)s änderte seinen Status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:256
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s angemeldet"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:264
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s abgemeldet"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:276
 #, python-format
 msgid "New Single Message from %(nickname)s"
-msgstr "Neue einzelne Nachricht von %(nickname)s"
+msgstr "Einzelne neue Nachricht von %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:284
 #, python-format
 msgid "New Private Message from group chat %s"
-msgstr "Neue private Nachricht von Gruppenchat %s"
+msgstr "Neue private Nachricht aus dem Chatraum %s"
 
-#: ../src/notify.py:270
+#: ../src/notify.py:286
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:273
+#: ../src/notify.py:289
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:295
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
+#: ../src/notify.py:564
+msgid "Ignore"
+msgstr "Ignorieren"
+
 #: ../src/osx/growler.py:10
 msgid "Generic"
 msgstr "Allgemein"
 
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
-msgstr "Empfange Profil ..."
+msgstr "Empfange Profil …"
 
-#: ../src/profile_window.py:108
-#: ../src/roster_window.py:2768
+#: ../src/profile_window.py:108 ../src/roster_window.py:2759
 msgid "File is empty"
 msgstr "Datei ist leer"
 
-#: ../src/profile_window.py:111
-#: ../src/roster_window.py:2771
+#: ../src/profile_window.py:111 ../src/roster_window.py:2762
 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:2773
-#: ../src/roster_window.py:2784
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2764 ../src/roster_window.py:2775
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
@@ -8504,11 +9241,13 @@
 
 #: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
-msgstr "Sie müssen angemeldet sein, um Kontaktinformationen zu veröffentlichen"
+msgstr ""
+"Sie müssen angemeldet sein, um Kontaktinformationen veröffentlichen zu "
+"können."
 
 #: ../src/profile_window.py:332
 msgid "Sending profile..."
-msgstr "Sende Profil ..."
+msgstr "Sende Profil …"
 
 #: ../src/profile_window.py:347
 msgid "Information NOT published"
@@ -8516,352 +9255,392 @@
 
 #: ../src/profile_window.py:354
 msgid "vCard publication failed"
-msgstr "vCard Veröffentlichung fehlgeschlagen"
+msgstr "Veröffentlichung der vCard fehlgeschlagen"
 
 #: ../src/profile_window.py:355
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler aufgetreten, versuchen Sie es später nochmals."
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
+"aufgetreten. Versuchen Sie es später erneut."
 
-#: ../src/roster_window.py:286
-#: ../src/roster_window.py:940
+#: ../src/roster_window.py:285 ../src/roster_window.py:939
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1869
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1851
+#: ../src/roster_window.py:1870
 #, python-format
 msgid "Now \"%s\" will know your status."
-msgstr "\"%s\" kennt jetzt ihren Status."
+msgstr "\"%s\" kennt jetzt Ihren Status."
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1890
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1891
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
-msgstr "Wenn \"%s\" diese Anfrage akzeptiert, erfahren Sie dessen Status."
+msgstr ""
+"Wenn \"%s\" diese Anfrage akzeptiert, können Sie seinen/ihren Status sehen."
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1903
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1885
+#: ../src/roster_window.py:1904
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
-#: ../src/roster_window.py:1909
-msgid "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)"
-msgstr "Gnome Keyring ist installiert, aber nicht \t\t\t\t\t\t\tkorrekt gestartet(Umgebungsvariablen sind möglicherweise nicht \t\t\t\t\t\t\tkorrekt gesetzt gesetzt)"
-
-#: ../src/roster_window.py:1919
-#: ../src/roster_window.py:1939
+# TODO: GPG/PGP unification in original strings needed
+#: ../src/roster_window.py:1929
 msgid "GPG is not usable"
 msgstr "GPG ist nicht benutzbar"
 
-#: ../src/roster_window.py:2103
-#: ../src/roster_window.py:3247
+#: ../src/roster_window.py:2093 ../src/roster_window.py:3259
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2104
-#: ../src/roster_window.py:3248
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Wenn Sie Ihren Status auf unsichtbar setzen, werden sie von diesen Gruppenchats getrennt. Sind Sie sicher, dass sie unsichtbar werden möchten?"
+#: ../src/roster_window.py:2094 ../src/roster_window.py:3260
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+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:2130
+#: ../src/roster_window.py:2120
 msgid "desync'ed"
-msgstr "Nicht abgestimmt"
+msgstr "Nicht synchronisiert"
 
-#: ../src/roster_window.py:2268
-#: ../src/roster_window.py:2505
+#: ../src/roster_window.py:2258 ../src/roster_window.py:2495
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2269
-msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
-msgstr "Nachrichten werden nur für das spätere Lesen verfügbar sein, wenn der Verlauf aktiviert wurde und der Kontakt sich in der Kontaktliste befindet."
+#: ../src/roster_window.py:2259
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+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:2506
+#: ../src/roster_window.py:2496
 msgid "You must read them before removing this transport."
-msgstr "Sie müssen sie alle lesen, bevor der Account entfernt wird."
+msgstr "Sie müssen sie lesen, bevor das Konto entfernt wird."
 
-#: ../src/roster_window.py:2509
+#: ../src/roster_window.py:2499
 #, python-format
 msgid "Transport \"%s\" will be removed"
-msgstr "Transport \"%s\" wird entfernt"
+msgstr "Der Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:2510
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Sie können nun keine Nachrichten mehr mit Kontakten von diesem Transport austauschen."
+#: ../src/roster_window.py:2500
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Sie können nun keine Nachrichten mehr mit Kontakten über diesen Transport "
+"austauschen."
 
-#: ../src/roster_window.py:2513
+#: ../src/roster_window.py:2503
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:2518
+#: ../src/roster_window.py:2508
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
-msgstr "Sie können nun keine Nachrichten mehr mit Kontakten von diesen Transporten austauschen: %s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+msgstr ""
+"Sie können nun keine Nachrichten mehr mit Kontakten über diese Transporte "
+"austauschen: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2649
+#: ../src/roster_window.py:2639
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: ../src/roster_window.py:2650
+#: ../src/roster_window.py:2640
 #, 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:2657
+#: ../src/roster_window.py:2647
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2648
 #, 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:2714
+#: ../src/roster_window.py:2705
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2706
 #, 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:2716
+#: ../src/roster_window.py:2707
 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:2755
+#: ../src/roster_window.py:2746
 msgid "Assign OpenPGP Key"
-msgstr "OpenPGP-Schlüssel Zuweisen"
+msgstr "OpenPGP-Schlüssel zuweisen"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2747
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:3108
+#: ../src/roster_window.py:3100
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
-msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt"
+msgstr "Kontakt \"%s\" wird von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3112
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch die Berechtigung Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als offline sehen wird."
+#: ../src/roster_window.py:3102
+#, 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:3107
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch die "
+"Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
+"offline sehen wird."
+
 #. Contact is not in roster
-#: ../src/roster_window.py:3117
+#: ../src/roster_window.py:3113
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortsetzen?"
 
-#: ../src/roster_window.py:3121
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch standardmäßig die Berechtigung Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als offline sehen wird."
+#: ../src/roster_window.py:3116
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch die "
+"Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
+"offline sehen wird."
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3119
 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"
+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:3128
+#: ../src/roster_window.py:3123
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3128
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Durch das Entfernen dieser Kontakte:%s\n"
-"entziehen Sie ihnen auch die Berechtigung Ihren Status zu sehen, wodurch die Kontakte Sie nur noch als offline sehen werden."
+"entziehen Sie ihnen auch die Berechtigung, Ihren Status zu sehen, wodurch "
+"die Kontakte Sie nur noch als offline sehen werden."
 
-#: ../src/roster_window.py:3171
+#: ../src/roster_window.py:3183
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3184
 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."
+msgstr ""
+"Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden "
+"können."
 
-#: ../src/roster_window.py:3687
+#: ../src/roster_window.py:3734
 msgid "Metacontacts storage not supported by your server"
-msgstr "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
+msgstr ""
+"Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: ../src/roster_window.py:3689
-msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
-msgstr "Ihr Server unterstützt leider nicht das Speichern von Metakontakt-Informationen. Aus diesem Grund werden diese Informationen bei der nächsten Neuverbindung nicht gespeichert werden."
+#: ../src/roster_window.py:3736
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Ihr Server unterstützt das Speichern von Metakontakt-Informationen nicht. "
+"Daher werden diese Informationen bei der nächsten Neuverbindung nicht "
+"gespeichert."
 
-#: ../src/roster_window.py:3763
-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:3821
+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:3765
-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 "Metakontakte sind eine Möglichkeit, mehrere Kontakte in einer Zeile zu gruppieren. Normalerweise benutzt man Sie, wenn eine Person mehrere Jabber- oder Transport-Konten hat."
+#: ../src/roster_window.py:3823
+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 ""
+"Metakontakte sind eine Möglichkeit, mehrere Kontakte in einer Zeile zu "
+"gruppieren. Sie werden normalerweise verwendet, wenn eine Person mehrere "
+"Jabber- oder Transport-Konten hat."
 
-#: ../src/roster_window.py:3878
+#: ../src/roster_window.py:3936
 msgid "Invalid file URI:"
-msgstr "Ungültige Datei URI:"
+msgstr "Ungültiger Datei-URI:"
 
-#: ../src/roster_window.py:3889
+#: ../src/roster_window.py:3947
 #, 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:"
+msgstr[0] "Wollen Sie die Datei an %s senden?"
+msgstr[1] "Wollen Sie die Dateien an %s senden?"
 
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4566
-#: ../src/roster_window.py:4637
-#: ../src/roster_window.py:4646
-#: ../src/systray.py:219
-#: ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4624 ../src/roster_window.py:4695
+#: ../src/roster_window.py:4704 ../src/systray.py:215 ../src/systray.py:262
+#: ../src/systray.py:268
 #, python-format
 msgid "using account %s"
-msgstr "mit Konto %s"
+msgstr "über das Konto %s"
 
 #. add
-#: ../src/roster_window.py:4653
+#: ../src/roster_window.py:4711
 #, python-format
 msgid "to %s account"
-msgstr "an Konto %s"
+msgstr "an das Konto %s"
 
 #. disco
-#: ../src/roster_window.py:4658
+#: ../src/roster_window.py:4716
 #, python-format
 msgid "using %s account"
-msgstr "mit Konto %s"
+msgstr "über das Konto %s"
 
-#: ../src/roster_window.py:4695
-#: ../src/systray.py:257
+#: ../src/roster_window.py:4753 ../src/systray.py:278
 msgid "_Manage Bookmarks..."
-msgstr "Lesezeichen _verwalten ..."
+msgstr "_Gespeicherte Chaträume …"
 
 #. profile, avatar
-#: ../src/roster_window.py:4715
+#: ../src/roster_window.py:4773
 #, python-format
 msgid "of account %s"
-msgstr "von Konto %s"
+msgstr "des Kontos %s"
 
-#: ../src/roster_window.py:4755
+#: ../src/roster_window.py:4813
 #, python-format
 msgid "for account %s"
-msgstr "für Konto %s"
+msgstr "für das Konto %s"
 
-#: ../src/roster_window.py:4817
-#: ../src/roster_window.py:4926
+#: ../src/roster_window.py:4875 ../src/roster_window.py:4984
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:4844
+#: ../src/roster_window.py:4902
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: ../src/roster_window.py:4851
+#: ../src/roster_window.py:4909
 msgid "Mood"
 msgstr "Stimmung"
 
-#: ../src/roster_window.py:4855
+#: ../src/roster_window.py:4913
 msgid "Activity"
 msgstr "Aktivität"
 
-#: ../src/roster_window.py:4860
+#: ../src/roster_window.py:4918
 msgid "Configure Services..."
-msgstr "Dienste konfigurieren ..."
+msgstr "Dienste konfigurieren …"
 
-#: ../src/roster_window.py:5014
+#: ../src/roster_window.py:5072
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
 #. Send Group Message
-#: ../src/roster_window.py:5022
-#: ../src/roster_window.py:5548
+#: ../src/roster_window.py:5080 ../src/roster_window.py:5606
 msgid "Send Group M_essage"
-msgstr "_Sende Nachricht an Gruppe"
+msgstr "Nachricht an die Gruppe _senden"
 
-#: ../src/roster_window.py:5030
+#: ../src/roster_window.py:5088
 msgid "To all users"
-msgstr "An alle Benutzern"
+msgstr "An alle Benutzer"
 
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:5092
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
-#: ../src/roster_window.py:5445
+#: ../src/roster_window.py:5503
 msgid "I would like to add you to my roster"
-msgstr "Ich würde dich gerne in meine Liste aufnehmen"
+msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5568
+#: ../src/roster_window.py:5626
 msgid "_Manage Contacts"
 msgstr "Kontakte verwalten"
 
 #. Send single message
-#: ../src/roster_window.py:5629
+#: ../src/roster_window.py:5687
 msgid "Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5685
+#: ../src/roster_window.py:5743
 msgid "_Manage Transport"
-msgstr "Transports"
+msgstr "_Transport verwalten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5693
+#: ../src/roster_window.py:5751
 msgid "_Modify Transport"
-msgstr "Trans_port ändern"
+msgstr "_Ändern"
 
-#: ../src/roster_window.py:5767
+#: ../src/roster_window.py:5825
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: ../src/roster_window.py:5774
+#: ../src/roster_window.py:5832
 msgid "_Disconnect"
 msgstr "_Verbindung trennen"
 
-#: ../src/roster_window.py:5854
+#: ../src/roster_window.py:5912
 msgid "_New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 #. History manager
-#: ../src/roster_window.py:5967
+#: ../src/roster_window.py:6025
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: ../src/roster_window.py:5976
+#: ../src/roster_window.py:6034
 msgid "_Join New Group Chat"
-msgstr "_Gruppenchat betreten"
+msgstr "_Chatraum betreten …"
 
-#: ../src/roster_window.py:6186
+#: ../src/roster_window.py:6244
 msgid "Change Status Message..."
-msgstr "Ändere Statusnachricht ..."
+msgstr "Ändere Statusnachricht …"
 
 #: ../src/search_window.py:93
 msgid "Waiting for results"
 msgstr "Warte auf Ergebnisse"
 
-#: ../src/search_window.py:133
-#: ../src/search_window.py:211
+#: ../src/search_window.py:133 ../src/search_window.py:211
 msgid "Error in received dataform"
-msgstr "Fehler den empfangenen Daten"
+msgstr "Fehler im empfangenen Datenformular"
 
 #. No result
-#: ../src/search_window.py:167
-#: ../src/search_window.py:203
+#: ../src/search_window.py:167 ../src/search_window.py:203
 msgid "No result"
 msgstr "Kein Ergebnis"
 
@@ -8869,17 +9648,16 @@
 msgid "Disk WriteError"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/session.py:237
+#: ../src/session.py:238
 #, python-format
 msgid "Subject: %s"
 msgstr "Thema: %s"
 
-#: ../src/session.py:397
-#: ../src/session.py:432
+#: ../src/session.py:403 ../src/session.py:438
 msgid "Confirm these session options"
 msgstr "Bestätigen Sie diese Sitzungsoptionen"
 
-#: ../src/session.py:399
+#: ../src/session.py:405
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -8894,7 +9672,7 @@
 "\n"
 "\t\tSind diese Einstellungen akzeptabel?"
 
-#: ../src/session.py:433
+#: ../src/session.py:439
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -8911,26 +9689,24 @@
 
 #: ../src/systray.py:176
 msgid "_Change Status Message..."
-msgstr "Ändere _Statusnachricht ..."
+msgstr "Ändere _Statusnachricht …"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
 
-#: ../src/tooltips.py:327
-#: ../src/tooltips.py:521
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
 msgid "Jabber ID: "
-msgstr "Jabber-ID:"
+msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:330
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
 msgid "Resource: "
 msgstr "Ressource: "
 
 #: ../src/tooltips.py:335
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
-msgstr "%(owner_or_admin_or_member)s dieses Gruppenchats"
+msgstr "%(owner_or_admin_or_member)s dieses Chatraums"
 
 #: ../src/tooltips.py:432
 msgid " [blocked]"
@@ -8940,8 +9716,7 @@
 msgid " [minimized]"
 msgstr " [minimiert]"
 
-#: ../src/tooltips.py:451
-#: ../src/tooltips.py:706
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
 msgid "Status: "
 msgstr "Status: "
 
@@ -9000,8 +9775,7 @@
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: ../src/tooltips.py:684
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
 msgid "Not started"
 msgstr "Nicht gestartet"
 
@@ -9009,8 +9783,7 @@
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:690
-#: ../src/tooltips.py:693
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
 msgid "Completed"
 msgstr "Abgeschlossen"
 
@@ -9039,978 +9812,93 @@
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich veraltet oder defekt"
 
-#: ../src/vcard.py:245
+#: ../src/vcard.py:246
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:247
+#: ../src/vcard.py:248
 msgid "?OS:Unknown"
-msgstr "Unbekannt"
+msgstr "?OS:Unbekannt"
 
-#: ../src/vcard.py:272
-#: ../src/vcard.py:282
-#: ../src/vcard.py:482
+#: ../src/vcard.py:269
+msgid "?Time:Unknown"
+msgstr "?Time:Unbekannt"
+
+#: ../src/vcard.py:293 ../src/vcard.py:303 ../src/vcard.py:524
 #, python-format
 msgid "since %s"
 msgstr "seit %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:332
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Mitgliedschaft:</b>"
 
-#: ../src/vcard.py:319
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Dieser Kontakt ist an Ihren Anwesenheitsinformationen interessiert, aber Sie sind nicht an seiner/ihrer Anwesenheit interessiert"
+#: ../src/vcard.py:340
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Dieser Kontakt ist an Ihrem Status interessiert, aber Sie sind nicht an "
+"seinem interessiert"
 
-#: ../src/vcard.py:321
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Sie sind an den Anwesenheitsinformationen des Kontakts interessiert, aber er/sie ist nicht an ihren interessiert"
+#: ../src/vcard.py:342
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Sie sind am Status des Kontakts interessiert, aber er ist nicht an Ihrem "
+"interessiert"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:344
 msgid "You and the contact are interested in each other's presence information"
-msgstr "Sie und der Kontakt sind an den Anwesenheitsinformationen des Anderen interessiert"
+msgstr "Sie und der Kontakt sind am Status des Anderen interessiert"
 
 #. None
-#: ../src/vcard.py:325
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Sie sind nicht an der Anwesenheit des Kontakts interessiert, und er/sie ist nicht interessiert an ihrer"
+#: ../src/vcard.py:346
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Sie sind nicht am Status des Kontakts interessiert, und er ist nicht Ihrem "
+"interessiert"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:353
 msgid "You are waiting contact's answer about your subscription request"
-msgstr "Sie warten auf die Antwort des Kontaktes auf ihre Abonnement-Anfrage"
+msgstr ""
+"Sie warten auf die Antwort des Kontaktes bezüglich Ihrer Abonnement-Anfrage"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:355
 msgid "There is no pending subscription request."
 msgstr "Es gibt keine offenen Abonnementanfragen."
 
-#: ../src/vcard.py:339
-#: ../src/vcard.py:377
-#: ../src/vcard.py:507
+#: ../src/vcard.py:360 ../src/vcard.py:415 ../src/vcard.py:549
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
-#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-#~ msgstr ""
-#~ "Klicken, um die Fähigkeiten (z.B. MSN-, ICQ-Transporte) auf Jabber-"
-#~ "Servern zu sehen."
-#~ msgid "Servers Features"
-#~ msgstr "Fähigkeiten des Servers"
-#~ msgid "_Host:"
-#~ msgstr "P_roxy:"
-#~ msgid "Select the account with which to synchronise"
-#~ msgstr "Wählen Sie das Benutzerkonto mit welchem synchronisiert werden soll"
-#~ msgid "Requires compilation of the idle module from Gajim sources."
-#~ msgstr "Erfordert die Kompilation des Idle-Moduls aus den Gajim-Quellen."
+#~ msgid "Your JID:"
+#~ msgstr "Ihre Jabber-ID:"
 
-#, fuzzy
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Open_PGP-Verschlüsselung aktivieren"
-#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-#~ msgstr ""
-#~ "%s hat keinen OpenPGP-Schlüssel verbreitet und es wurde keiner zugewiesen"
-#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-#~ msgstr ""
-#~ "Kein Befehl: /%s (wenn Sie dies senden wollen, setzen Sie /say voran)"
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Fehler beim Ausführen von \"%(command)s\": %(error)s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
-#~ "person. (e.g. /%s explodes.)"
-#~ msgstr ""
-#~ "Bedienung: /%(command)s <action>, sendet Aktion im aktuellen Gruppenchat. "
-#~ "Verwenden Sie eine dritte Person, z.B. mit /%(command)s explodiert)."
-#~ msgid "Encryption enabled"
-#~ msgstr "Verschlüsselung aktiviert"
-#~ msgid "Encryption disabled"
-#~ msgstr "Verschlüsselung deaktiviert"
-#~ msgid "The username used to identify the Last.fm account."
-#~ msgstr "Benutzername zur Identifikation des Last.FM Kontos."
-#~ msgid "Thoughtful"
-#~ msgstr "Nachdenklich"
-#~ msgid "Network Manager support not available"
-#~ msgstr "Unterstützung für Network Manager nicht verfügbar"
-#~ msgid "Session Management support not available (missing gnome.ui module)"
-#~ msgstr ""
-#~ "Sitzungsmanagment-Unterstützung nicht verfügbar (Modul gnome.ui fehlt)"
-#~ msgid ""
-#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
-#~ "their status and not by the shown name"
-#~ msgstr ""
-#~ "Wenn aktiviert, wird Gajim die Kontakte in der Kontaktliste und "
-#~ "Gruppenchats nach ihrem Status und nicht nach dem angezeigten Namen "
-#~ "sortieren"
-#~ msgid "E2E encryption enabled"
-#~ msgstr "Verschlüsselung aktiviert"
-#~ msgid "Close"
-#~ msgstr "Schließen"
-#~ msgid "Verify remote identity"
-#~ msgstr "Idenität überprüfen"
-#~ msgid "A_ccounts"
-#~ msgstr "_Konten"
-#~ msgid "<b>\"%(title)s\"</b> by "
-#~ msgstr "<b>\"%(title)s\"</b> von "
-#~ msgid "The following message was "
-#~ msgstr "Die folgende Nachricht wurde "
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Doppelte Jabber-ID"
 
-#, fuzzy
-#~ msgid "<b>Doing Chores</b>"
-#~ msgstr "<b>Chatlinien Farbe</b>"
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Dieser Kontakt wurde bereits konfiguriert."
 
-#, fuzzy
-#~ msgid "<b>Drinking</b>"
-#~ msgstr "<b>Beschreibung</b>"
+#~ msgid "%s is not a valid loglevel"
+#~ msgstr "%s ist kein gültiger Loglevel."
 
-#, fuzzy
-#~ msgid "<b>Eating</b>"
-#~ msgstr "<b>Einstellungen</b>"
-
-#, fuzzy
-#~ msgid "<b>Exercising</b>"
-#~ msgstr "<b>Einstellungen</b>"
-
-#, fuzzy
-#~ msgid "<b>Grooming</b>"
-#~ msgstr "<b>Vorname:</b>"
-
-#, fuzzy
-#~ msgid "<b>Having an Appointment</b>"
-#~ msgstr "Habe einen Termin"
-
-#, fuzzy
-#~ msgid "<b>Inactive</b>"
-#~ msgstr "<b>Vorname:</b>"
-
-#, fuzzy
-#~ msgid "<b>Relaxing</b>"
-#~ msgstr "<b>Einstellungen</b>"
-
-#, fuzzy
-#~ msgid "<b>Talking</b>"
-#~ msgstr "<b>Client:</b>"
-
-#, fuzzy
-#~ msgid "<b>Traveling</b>"
-#~ msgstr "<b>Einstellungen</b>"
-
-#, fuzzy
-#~ msgid "<b>Working</b>"
-#~ msgstr "<b>Schrift</b>"
-
-#, fuzzy
-#~ msgid "Other"
-#~ msgstr "Andere"
-#~ msgid "General:"
-#~ msgstr "Allgemein:"
-#~ msgid "Message:"
-#~ msgstr "Nachricht"
-#~ msgid "Specific:"
-#~ msgstr "Detailliert:"
-#~ msgid "%s is now %s"
-#~ msgstr "%s ist jetzt %s"
-#~ msgid "cold"
-#~ msgstr "Kalt"
-#~ msgid "hot"
-#~ msgstr "Heiß"
-#~ msgid "moody"
-#~ msgstr "Launisch"
-#~ msgid "working"
-#~ msgstr "Arbeiten"
-#~ msgid "eating"
-#~ msgstr "Essen"
-#~ msgid "inactive"
-#~ msgstr "Inaktiv"
-#~ msgid "walking"
-#~ msgstr "Spazieren gehen"
-#~ msgid "sleeping"
-#~ msgstr "Schlafen"
-#~ msgid "other"
-#~ msgstr "Sonstiges"
-#~ msgid "mood"
-#~ msgstr "Stimmung"
 #~ msgid ""
-#~ "Usage: %s %s %s \n"
-#~ "\t %s"
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
 #~ msgstr ""
-#~ "Verwendung: %s %s %s \n"
-#~ "\t %s"
-#~ msgid "%s - %s"
-#~ msgstr "%s - %s"
-#~ msgid "Accept"
-#~ msgstr "Akzeptieren"
-#~ msgid "Invitation Received"
-#~ msgstr "Einladung empfangen"
-#~ msgid ""
-#~ "When negotiating an encrypted session, should Gajim prefer to use public "
-#~ "keys for identification?"
-#~ msgstr ""
-#~ "Soll Gajim bei Aushandeln einer verschlüsselten Situng öffentliche "
-#~ "Schlüssel zur Identifikation bevorzugen?"
-#~ msgid ""
-#~ "To continue, Gajim needs to access your stored secrets. Enter your "
-#~ "passphrase"
-#~ msgstr ""
-#~ "Um fortzufahren benötigt Gajim Zugriff auf Ihre gespeicherten Passwörter. "
-#~ "Geben Sie Ihre Passphrase ein"
-#~ msgid "Confirm Passphrase"
-#~ msgstr "Passphrase bestätigen"
-#~ msgid "Enter your new passphrase again for confirmation"
-#~ msgstr "Passphrase zur Bestätigung erneut eingeben"
-#~ msgid "Create Passphrase"
-#~ msgstr "Passphrase erstellen"
-#~ msgid "Passphrases did not match.\n"
-#~ msgstr "Passphrasen stimmen nicht überein.\n"
-#~ msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
-#~ msgstr ""
-#~ "Sie müssen eine Passphrase angeben um Ihre gespeicherten Passwörter zu "
-#~ "verschlüsseln"
-#~ msgid "No X11 running and failed to start it! Quitting..."
-#~ msgstr "Kein laufender X-Server und Start erfolglos! Breche ab ..."
-#~ msgid "OK to continue with negotiation?"
-#~ msgstr "In Ordnung mit der Verhandlung fortzufahren?"
-#~ msgid ""
-#~ "You've begun an encrypted session with %s, but it can't be guaranteed "
-#~ "that you're talking directly to the person you think you are.\n"
-#~ "\n"
-#~ "You should speak with them directly (in person or on the phone) and "
-#~ "confirm that their Short Authentication String is identical to this one: %"
-#~ "s\n"
-#~ "\n"
-#~ "Would you like to continue with the encrypted session?"
-#~ msgstr ""
-#~ "Sie haben eine verschlüsselte Sitzung mit %s begonnen, aber es kann nicht "
-#~ "garantiert werden, dass Sie tatsächlich mit der Person sprechen, die sie "
-#~ "vorgibt zu sein.\n"
-#~ "\n"
-#~ "Sie sollten mit der Person direkt (persönlich oder am Telefon) sprechen "
-#~ "und sich vergewissern, dass ihr kurzer Authentifizierungs-String mit "
-#~ "diesem übereinstimmt: %s\n"
-#~ "\n"
-#~ "Möchten Sie mit der verschlüsselten Sitzung fortfahren?"
-#~ msgid "Yes, I verified the Short Authentication String"
-#~ msgstr "Ja, Ich habe den kurzen Authentifizierungs-String überprüft"
+#~ "Erfordert python-gnome2-extras oder die Kompilation des gtkspell-Moduls "
+#~ "aus den Gajim-Quellen."
 
-#, fuzzy
-#~ msgid "Authenticate contact"
-#~ msgstr "Kontakt automatisch autorisieren"
-#~ msgid "End OTR "
-#~ msgstr "OTR beenden "
-#~ msgid "OTR settings / fingerprint"
-#~ msgstr "OTR Einstellungen / Fingerprint"
-#~ msgid "Off-the-Record Encryption"
-#~ msgstr "OTR-Verschlüsselung"
-#~ msgid "Private conversation with %s lost."
-#~ msgstr "Private Unterhaltung mit %s unterbrochen."
-#~ msgid "Off the Record Encryption"
-#~ msgstr "OTR-Verschlüsselung"
-#~ msgid "Encrypting chatmessages in a way that even works through gateways."
-#~ msgstr ""
-#~ "Verschlüssltes Kommunizieren, welches auch über Transporte möglich ist"
-#~ msgid "Requires pyotr and libotr (see http://trac.gajim.org/wiki/OTR)."
-#~ msgstr "Erfordert pyotr und libotr (http://trac.gajim.org/wiki/OTR)."
-#~ msgid "Generating..."
-#~ msgstr "Generiere ..."
-#~ msgid ""
-#~ "\n"
-#~ "From: %(from_address)s"
-#~ msgstr ""
-#~ "\n"
-#~ "Von: %(from_address)s"
-#~ msgid "Click to see past conversation in this room"
-#~ msgstr "Klicken, um die früheren Unterhaltungen in diesem Raum zu sehen"
-#~ msgid "<b>Publish and Subscribe</b>"
-#~ msgstr "<b>Veröffentlichen und Abonnieren</b>"
-#~ msgid "Allow others to see your:"
-#~ msgstr "Erlaube anderen zu sehen:"
-#~ msgid "Receive your contact's:"
-#~ msgstr "Empfang von Kontakten:"
-#~ msgid "Tune"
-#~ msgstr "Musiktitel:"
-#~ msgid "<b>History Viewer</b>"
-#~ msgstr "<b>Verlauf ansehen</b>"
-#~ msgid "<b>JID Selection</b>"
-#~ msgstr "<b>JID Auswahl</b>"
-#~ msgid ""
-#~ "Choose the chatlog you want to view. \n"
-#~ "Enter the jid of a groupchat or a contact here. For online accounts you "
-#~ "can even enter a contact's nickname."
-#~ msgstr ""
-#~ "Wählen Sie das Chatlog, dass Sie ansehen möchten. \n"
-#~ "Geben Sie die Jabber-ID eines Gruppenchats oder eines Kontakts hier ein. "
-#~ "Für Kontakte, die online sind, können Sie sogar deren Spitzname eintragen."
-#~ msgid "in"
-#~ msgstr "in"
-#~ msgid "Musiktitel:"
-#~ msgstr "Art:"
-#~ msgid "Role:"
-#~ msgstr "Rolle:"
-#~ msgid "Affiliation:"
-#~ msgstr "Zugehörigkeit: "
-#~ msgid ""
-#~ "If checked, Gajim can regularly poll a Last.fm account and sends recently "
-#~ "played songs through PEP."
-#~ msgstr ""
-#~ "Wenn aktiviert, kann Gajim regelmäßig ein Last.FM Konto abfragen und "
-#~ "kürzlich gespielte Songs über PEP senden."
-#~ msgid "Connection to host could not be established"
-#~ msgstr "Verbindung zu Host konnte nicht hergestellt werden"
-#~ msgid ""
-#~ "Connection to host could not be established: Incorrect answer from server."
-#~ msgstr ""
-#~ "Verbindung zum Host konnte nicht aufgebaut werden: Fehlerhafte Antwort "
-#~ "vom Server."
-#~ msgid "<b>Please fill in the data for your new account</b>"
-#~ msgstr "<b>Bitte geben Sie die Daten für Ihr neues Konto ein</b>"
-#~ msgid "<b>Format of a line</b>"
-#~ msgstr "<b>Format einer Zeile</b>"
-#~ msgid ""
-#~ "An example: If you have enabled status message for away, Gajim won't ask "
-#~ "you anymore for a status message when you change your status to away; it "
-#~ "will use the default one set here"
-#~ msgstr ""
-#~ "Ein Beispiel: Wenn Sie eine Status-Nachricht für Abwesend aktiviert "
-#~ "haben, wird Sie Gajim nicht noch einmal nach einer Status-Nachricht "
-#~ "fragen, wenn Sie Ihren Status zu Abwesend ändern; es wird die hier "
-#~ "definierte Nachricht verwendet."
-#~ msgid ""
-#~ "Determined by sender\n"
-#~ "Chat message\n"
-#~ "Single message"
-#~ msgstr ""
-#~ "Festgelegt vom Absender\n"
-#~ "Chat-Nachricht\n"
-#~ "Einzelne Nachricht"
-#~ msgid "Events"
-#~ msgstr "Ereignisse"
-#~ msgid "Hides buttons in chatwindows to "
-#~ msgstr "Versteckt die Knöpfe im Gruppenchat-Fenster."
-#~ msgid "Privacy"
-#~ msgstr "Privatsphäre"
-#~ msgid "Publish _Mood"
-#~ msgstr "_Veröffentliche Stimmung"
-#~ msgid "Set status message to reflect currently playing _music track"
-#~ msgstr "Setze Status-Nachricht auf den aktuell spielenden _Musiktitel"
-#~ msgid "Subscribe to M_ood"
-#~ msgstr "Abonniere Stimmung"
-#~ msgid "Subscribe to T_une"
-#~ msgstr "Abonnieren Musiktitel"
-#~ msgid "The auto away status message"
-#~ msgstr "Automatische Statusnachricht für Abwesend"
-#~ msgid "The auto not available status message"
-#~ msgstr "Automatische Statusnachricht für Nicht verfügbar"
-#~ msgid "Treat all incoming messages as:"
-#~ msgstr " Behandle alle eingehenden Nachrichten als:"
-#~ msgid ""
-#~ "Works for Rhythmbox and Muine players. For more players, please visit "
-#~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-#~ msgstr ""
-#~ "Funktioniert mit Rhythmbox und Muine. Für weitere Wiedergabeprogramme "
-#~ "besuchen Sie bitte http://trac.gajim.org/wiki/GajimAndMusicPlayer "
-#~ "(Englisch)"
-#~ msgid "_Advanced Notifications Control..."
-#~ msgstr "_Erweiterter Konfigurations-Editor ..."
-#~ msgid "_Player:"
-#~ msgstr "_Player:"
-#~ msgid "Address"
-#~ msgstr "Adresse"
-#~ msgid "City:"
-#~ msgstr "Stadt:"
-#~ msgid "Company:"
-#~ msgstr "Firma:"
-#~ msgid "Country:"
-#~ msgstr "Land:"
-#~ msgid "Given:"
-#~ msgstr "Vorname:"
-#~ msgid "Middle:"
-#~ msgstr "Mittelname"
-#~ msgid "Position:"
-#~ msgstr "Position:"
-#~ msgid "Prefix:"
-#~ msgstr "Präfix"
-#~ msgid "State:"
-#~ msgstr "Staat:"
-#~ msgid "Suffix:"
-#~ msgstr "Suffix:"
-#~ msgid "_Services"
-#~ msgstr "_Dienste"
-#~ msgid "Ask:"
-#~ msgstr "Frage:"
-#~ msgid "Client:"
-#~ msgstr "Client:"
-#~ msgid "OS:"
-#~ msgstr "BS:"
-#~ msgid "Subscription:"
-#~ msgstr "Abonnement:"
-#~ msgid "You will always see him or her as offline."
-#~ msgstr "Sie werden den Kontakt ab sofort als offline sehen."
-#~ msgid "%s is now %s (%s)"
-#~ msgstr "%s ist jetzt %s (%s)"
-#~ msgid "Connected to server %s:%s with %s"
-#~ msgstr "Verbunden mit Server %s:%s mit %s"
-#~ msgid "View next message"
-#~ msgstr "Zeige nächste Nachricht"
-#~ msgid "_Next"
-#~ msgstr "Nächste"
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim-Konto %s"
 
-#, fuzzy
-#~ msgid "_Quote"
-#~ msgstr "_Beenden"
-
-#, fuzzy
-#~ msgid "from_name"
-#~ msgstr "thema_name"
-
-#, fuzzy
-#~ msgid "to_name"
-#~ msgstr "_Umbenennen"
-#~ msgid ""
-#~ "Chat message \n"
-#~ "Single message"
-#~ msgstr ""
-#~ "Chat-Nachricht\n"
-#~ "Einzelne Nachricht"
-
-#, fuzzy
-#~ msgid "Default outgoing messages type:"
-#~ msgstr "_Ausgehende Nachricht:"
-#~ msgid ""
-#~ "Never\n"
-#~ "Always\n"
-#~ "Per account\n"
-#~ "Per type"
-#~ msgstr ""
-#~ "Niemals\n"
-#~ "Immer\n"
-#~ "Pro Account\n"
-#~ "Pro Typ"
-#~ msgid "Use only one message _window:"
-#~ msgstr "Nur ein _Nachrichtenfenster:"
-#~ msgid "OpenPGP Encryption enabled"
-#~ msgstr "OpenPGP-Verschlüsselung aktiviert"
-#~ msgid "OpenPGP Encryption disabled"
-#~ msgstr "OpenPGP-Verschlüsselung deaktiviert"
-#~ msgid "%s - Gajim"
-#~ msgstr "%s - Gajim"
-#~ msgid "_New group chat"
-#~ msgstr "_Neuer Gruppenchat"
-#~ msgid "_Log off"
-#~ msgstr "_Abmelden"
-#~ msgid "_Log on"
-#~ msgstr "_Anmelden"
-#~ msgid "Save passphrase"
-#~ msgstr "Passphrase speichern"
-#~ msgid "Invite _Friends"
-#~ msgstr "_Freunde einladen"
-#~ msgid "Build custom query"
-#~ msgstr "Personalisierte Anfrage bauen"
-#~ msgid ""
-#~ "Enter a contact jid or MUC jid here to view its history.\n"
-#~ "If a contact is connected you can even enter his nick name.\n"
-#~ msgstr ""
-#~ "Geben Sie hier eine JID ein, im ihren Verlauf anzusehen.\n"
-#~ "Wenn ein Kontakt eingeloggt ist, können Sie sogar seinen Spitznamen "
-#~ "eingeben.\n"
-#~ msgid "Query Builder..."
-#~ msgstr "Anfrage-Baukasten ..."
-#~ msgid "%s does not appear to be a valid JID"
-#~ msgstr "%s scheint keine gültige JID zu sein"
-#~ msgid "_Discover Services..."
-#~ msgstr "_Durchsuche Dienste..."
-#~ msgid "_Retype Password:"
-#~ msgstr "Passwort e_rneut eingeben:"
-#~ msgid ""
-#~ "If checked, all local contacts that use a Bonjour compatible chat client "
-#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
-#~ "be connected to a jabber server for it to work.\n"
-#~ "This is only available if python-avahi is installed and avahi-daemon is "
-#~ "running."
-#~ msgstr ""
-#~ "Wenn aktiviert, werden alle lokalen Kontakte, welche einen zu Bonjour "
-#~ "kompatiblen Chat-Client (Wie z.B. iChat, Trillian oder Gaim) nutzen, in "
-#~ "Ihrer Kontaktliste angezeigt. Dafür müssen Sie nicht mit einem Jabber-"
-#~ "Server verbunden sein.\n"
-#~ "Dies ist nur möglich, wenn python-avahi verfügbar ist und avahi-daemon "
-#~ "läuft (Automatische Diensterkennung)."
-#~ msgid ""
-#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
-#~ "contacts as if you had one account"
-#~ msgstr ""
-#~ "Wenn Sie zwei oder mehr Konten haben und diese Option gewählt ist, wird "
-#~ "Gajim alle Kontakte auflisten, als hätten Sie nur ein Konto"
-#~ msgid "_Enable link-local messaging"
-#~ msgstr "_Kontakte im LAN anzeigen"
-#~ msgid "_Modify"
-#~ msgstr "_Ändern"
-#~ msgid "_Compact View    Alt+C"
-#~ msgstr "_Kompakte Ansicht Alt+C"
-#~ msgid "<b>Interface Customization</b>"
-#~ msgstr "<b>Benutzerdefiniertes Aussehen</b>"
-#~ msgid "Also known as iChat style"
-#~ msgstr "Auch als iChat-Stil bekannt"
-#~ msgid "Chat"
-#~ msgstr "Chat"
-#~ msgid "E_very 5 minutes"
-#~ msgstr "Alle 5 _Minuten"
-#~ msgid ""
-#~ "Gajim will automatically show new events by popping up the relevant window"
-#~ msgstr ""
-#~ "Gajim wird neue Ereignisse automatisch anzeigen, indem das betreffende "
-#~ "Fenster geöffnet wird"
-#~ msgid ""
-#~ "Gajim will notify you for new events via a popup in the bottom right of "
-#~ "the screen"
-#~ msgstr ""
-#~ "Gajim wird Sie über neue Ereignisse mit einem Popup in der rechten "
-#~ "unteren Ecke des Bildschirms benachrichtigen"
-#~ msgid ""
-#~ "Gajim will notify you via a popup window in the bottom right of the "
-#~ "screen about contacts that just signed in"
-#~ msgstr ""
-#~ "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Ecke des "
-#~ "Bildschirmes über Kontakte informieren, die sich gerade angemeldet haben"
-#~ msgid ""
-#~ "Gajim will only change the icon of the contact that triggered the new "
-#~ "event"
-#~ msgstr ""
-#~ "Gajim wird nur das Symbol des Kontaktes ändern, von dem die neue "
-#~ "Nachricht kommt"
-#~ msgid ""
-#~ "If checked, Gajim will remember the roster and chat window positions in "
-#~ "the screen and the sizes of them next time you run it"
-#~ msgstr ""
-#~ "Wenn aktiviert, erinnert sich Gajim an die Position und Größe der "
-#~ "Kontaktliste auf dem Bildschirm beim nächsten Start"
-#~ msgid "On every _message"
-#~ msgstr "In jeder _Zeile"
-#~ msgid "Outgoing Chat state noti_fications:"
-#~ msgstr "_Sende Chatstatus:"
-#~ msgid "Print time:"
-#~ msgstr "Zeit anzeigen:"
-#~ msgid "Save _position and size for roster and chat windows"
-#~ msgstr "Speichere _Position und Größe der Kontaktliste und Chatfenster"
-#~ msgid "Show only in _roster"
-#~ msgstr "Nur in der _Kontaktliste anzeigen"
-#~ msgid "Use t_rayicon (aka. notification area icon)"
-#~ msgstr "Verwende _Trayicon (Benachrichtigungs-Icon)"
-#~ msgid ""
-#~ "When a new event (message, file transfer request etc..) is received, the "
-#~ "following methods may be used to inform you about it. Please note that "
-#~ "events about new messages only occur if it is a new message from a "
-#~ "contact you are not already chatting with"
-#~ msgstr ""
-#~ "Wenn ein neues Ereignis (Nachricht, Dateitransferanfrage usw.) empfangen "
-#~ "wird, können die folgenden Methoden zur Benachrichtigung verwendet "
-#~ "werden. Bitte beachten Sie, dass Ereignisse über neue Nachrichten nur "
-#~ "auftreten, wenn Sie eine Nachricht von einem Kontakt erhalten, mit dem "
-#~ "Sie nicht bereits chatten"
-#~ msgid "_Never"
-#~ msgstr "_Nie"
-#~ msgid "_Notify me about it"
-#~ msgstr "Be_nachrichtigen"
-#~ msgid "_Pop it up"
-#~ msgstr "_Öffnen"
-#~ msgid "_Remove from Roster"
-#~ msgstr "Entfernen von _Kontaktliste"
-#~ msgid "_Filter:"
-#~ msgstr "_Filter:"
-#~ msgid ""
-#~ "If that is not your language for which you want to highlight misspelled "
-#~ "words, then please set your $LANG as appropriate. Eg. for French do "
-#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
-#~ "make it global in /etc/profile.\n"
-#~ "\n"
-#~ "Highlighting misspelled words feature will not be used"
-#~ msgstr ""
-#~ "Wenn das nicht die Sprache ist, für die Sie falschgeschriebene Wörter "
-#~ "hervorheben möchten, setzen Sie bitte Ihre $LANG entsprechend. Z.B. für "
-#~ "Französisch: export LANG=fr_FR oder export LANG=fr_FR.UTF-8 in ~/."
-#~ "bash_profile or global in /etc/profile.\n"
-#~ "\n"
-#~ "Falschgeschriebene Wörter werden nicht hervorgehoben"
-#~ msgid "Every %s _minutes"
-#~ msgstr "Alle %s _Minuten"
-#~ msgid "You must enter a password for the new account."
-#~ msgstr "Sie müssen ein Passwort für das neue Konto eingeben."
-#~ msgid "Drop %s in group %s"
-#~ msgstr "Setze %s in Gruppe %s"
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Mache %s und %s Metakontakte"
-#~ msgid "Hides the buttons in two persons chat window."
-#~ msgstr "Versteckt die Knöpfe im Zwei-Personen-Chatfenster"
-#~ msgid "Security error connecting to \"%s\""
-#~ msgstr "Konnte nicht mit %s verbinden"
-#~ msgid ""
-#~ "The server's key has changed, or someone is trying to hack your "
-#~ "connection."
-#~ msgstr ""
-#~ "Der Schlüssel des Servers wurde geändert oder jemand versucht ihre "
-#~ "Verbindung zu hacken."
-#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
-#~ msgstr ""
-#~ "Konnte Fingerprint von %s nicht überprüfen. Die Verbindung ist "
-#~ "möglicherweise unsicher."
-#~ msgid "Missing fingerprint in SSL connection to %s"
-#~ msgstr "Fehlender Fingerabdruck in der SSL-Verbindung zu %s"
-#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-#~ msgstr "Fingerabdruck von %s stimmt nicht überein: Erhalten %s, erwartet %s"
-#~ msgid " %d unread single message"
-#~ msgid_plural " %d unread single messages"
-#~ msgstr[0] " %d ungelesene Einzel-Nachricht"
-#~ msgstr[1] " %d ungelesene Einzel-Nachrichten"
-#~ msgid " %d unread group chat message"
-#~ msgid_plural " %d unread group chat messages"
-#~ msgstr[0] " %d ungelesene Gruppenchat-Nachricht"
-#~ msgstr[1] " %d ungelesene Gruppenchat-Nachrichten"
-#~ msgid " %d unread private message"
-#~ msgid_plural " %d unread private messages"
-#~ msgstr[0] " %d ungelesene private Nachricht"
-#~ msgstr[1] " %d ungelesene private Nachrichten"
-#~ msgid "gtk+"
-#~ msgstr "gtk+"
-#~ msgid "Private Chat"
-#~ msgstr "Privater Chat"
-#~ msgid "Group Chat"
-#~ msgstr "Gruppenchat"
-#~ msgid "I'm %s"
-#~ msgstr "Ich bin %s"
-#~ msgid "2003-12-13T18:30:02Z"
-#~ msgstr "2003-12-13T18:30:02Z"
-#~ msgid "<small>Romeo and Juliet</small>"
-#~ msgstr "<small>Romeo und Julia</small>"
-#~ msgid "Old stories"
-#~ msgstr "Alte Geschichten"
-#~ msgid "Soliloquy"
-#~ msgstr "Selbstgespräch"
-#~ msgid "A_fter nickname:"
-#~ msgstr "Nach dem Spit_znamen:"
-#~ msgid "B_efore nickname:"
-#~ msgstr "Vor d_em Spitznamen:"
-#~ msgid "_After time:"
-#~ msgstr "_Nach der Zeit:"
-#~ msgid "_Before time:"
-#~ msgstr "_Vor der Zeit:"
-#~ msgid "_Retrieve"
-#~ msgstr "Ab_rufen"
-#~ msgid "Information published"
-#~ msgstr "Informationen veröffentlicht"
-#~ msgid "Without a connection, you can not get your contact information."
-#~ msgstr "Sie müssen angemeldet sein, um Kontakt-Informationen abzurufen"
-#~ msgid "This is result of query."
-#~ msgstr "Dies ist das Ergebnis der Anfrage."
-#~ msgid "Edit items on the list"
-#~ msgstr "Bearbeite Punkte auf der Liste"
-#~ msgid "Receive a Message"
-#~ msgstr "Nachricht empfangen"
-#~ msgid "Role: "
-#~ msgstr "Rolle:"
-#~ msgid ""
-#~ "Sound to play when any MUC message arrives. (This setting is taken into "
-#~ "account only if notify_on_all_muc_messages is True)"
-#~ msgstr ""
-#~ "Abzuspielender Ton, falls eine MUC-Nachricht ankommt. (Diese Einstellung "
-#~ "wirdnur beachtet, wenn notify_on_all_muc_messages aktiviert ist)"
-#~ msgid "Create your own Privacy Lists"
-#~ msgstr "Erstelle eigene Privatliste"
-#~ msgid "Server-based Privacy Lists"
-#~ msgstr "Server-basierte Privatliste"
-#~ msgid "Contact _Info"
-#~ msgstr "Kontakt-_Info"
-#~ msgid "Jabber ID"
-#~ msgstr "Jabber-ID"
-#~ msgid "User ID"
-#~ msgstr "Benutzer-ID"
-#~ msgid "Invalid room or server name"
-#~ msgstr "Ungültiger Raum oder Servername"
-#~ msgid "vCard publication succeeded"
-#~ msgstr "vCard erfolgreich veröffentlicht"
-#~ msgid "Your personal information has been published successfully."
-#~ msgstr "Ihre persönlichen Informationen wurden erfolgreich veröffentlicht."
-#~ msgid "Gajim - %d unread message"
-#~ msgid_plural "Gajim - %d unread messages"
-#~ msgstr[0] "Gajim - %d ungelesene Nachricht"
-#~ msgstr[1] "Gajim - %d ungelesene Nachrichten"
-#~ msgid "Since %s"
-#~ msgstr "Seit %s"
-#~ msgid "Be right back"
-#~ msgstr "Bin gleich zurück"
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-#~ msgid "Migrating Logs..."
-#~ msgstr "Migriere Logs ..."
-#~ msgid "Send File"
-#~ msgstr "Datei Senden"
-#~ msgid "_Join New Room..."
-#~ msgstr "_Neuen Raum betreten..."
-#~ msgid "<b>Please modify your special notification below</b>"
-#~ msgstr "<b>Bitte wählen Sie eine der Optionen:</b>"
-#~ msgid "Delete Message of the Day"
-#~ msgstr "Lösche Nachricht des Tages"
-#~ msgid "I want to listen to:"
-#~ msgstr "%s möchte ihnen eine Datei senden:"
-#~ msgid "Send _New Message..."
-#~ msgstr "Sende _neue Nachricht..."
-#~ msgid "Set Message of the Day"
-#~ msgstr "Setze Message of the Day"
-#~ msgid "Update Message of the Day"
-#~ msgstr "Aktualisiere Nachricht des Tages (MOTD)"
-#~ msgid "_XML Console..."
-#~ msgstr "_XML Konsole..."
-#~ msgid "Use compact view when you open a chat window"
-#~ msgstr "Kompaktansicht verwenden, wenn Sie ein Chatfenster öffnen"
-#~ msgid "Use compact view when you open a group chat window"
-#~ msgstr "Verwende Kompaktansicht wenn ein Gruppenchat-Fenster geöffnet wird"
-#~ msgid "Send"
-#~ msgstr "Senden"
-#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-#~ msgstr ""
-#~ "%(nickname)s im Raum %(room_name)s hat Ihnen eine neue Nachricht gesendet."
-#~ msgid "%s has sent you a new message."
-#~ msgstr "%s hat Ihnen eine neue Nachricht gesendet."
-#~ msgid "GUI Migration failed"
-#~ msgstr "vCard Veröffentlichung fehlgeschlagen"
-#~ msgid "Logs have been successfully migrated to the database."
-#~ msgstr "Logs wurden erfolgreich in die Datenbank migriert."
-#~ msgid "Start Chat with Contact"
-#~ msgstr "Starte Chat mit Account %s"
-#~ msgid "All contacts in this group are offline or have errors"
-#~ msgstr "Alle Kontakte dieser Gruppe sind abgemeldet oder haben Fehler"
-#~ msgid "Size: "
-#~ msgstr "Größe: "
-#~ msgid "Session bus is not available"
-#~ msgstr "Session-Bus nicht verfügbar"
-#~ msgid "Sound"
-#~ msgstr "Sound"
-#~ msgid "Image"
-#~ msgstr "Bild"
-#~ msgid "To %s"
-#~ msgstr "An %s"
-#~ msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
-#~ msgstr "Sie wurden in den Raum %(room_jid)s von %(contact_jid)s eingeladen"
-#~ msgid "Manage Emoticons"
-#~ msgstr "Emoticons anpassen"
-#~ msgid "Or choose a preset message:"
-#~ msgstr "Oder wählen Sie eine voreingestellte Nachricht:"
-#~ msgid "Use _emoticons"
-#~ msgstr "_Emoticons verwenden"
-#~ msgid "_Set Image..."
-#~ msgstr "_Bild wählen..."
-#~ msgid "Switch to %s"
-#~ msgstr "Wechseln zu %s"
-#~ msgid "using account "
-#~ msgstr "mit Konto"
-#~ msgid "The filesize of image \"%s\" is too large"
-#~ msgstr "Die Dateigröße des Bildes \"%s\" ist zu groß"
-#~ msgid "The file must not be more than 32 kilobytes."
-#~ msgstr "Die Datei darf nicht größer als 32 Kilobytes sein."
-#~ msgid "Timeout"
-#~ msgstr "Timeout"
-#~ msgid "account: "
-#~ msgstr "Konto: "
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "Möchten Sie die Räume \"%s\" wirklich verlassen?"
-#~ msgid "If you close this window, you will be disconnected from these rooms."
-#~ msgstr ""
-#~ "Wenn Sie dieses Fenster schließen, wird die Verbindung mit diesen Räumen "
-#~ "abgebrochen."
-#~ msgid "Activate/Disable notification for when a file transfer is complete"
-#~ msgstr "Benachrichtigung für beendete Dateitransfers ein/ausschalten"
-#~ msgid "Removing selected file transfer"
-#~ msgstr "Ausgewählten Dateitransfer entfernen"
-#~ msgid "Stoping selected file transfer"
-#~ msgstr "Bricht den ausgewählten Dateitransfer ab"
-#~ msgid ""
-#~ "If you close this tab and you have history disabled, the message will be "
-#~ "lost."
-#~ msgstr ""
-#~ "Wenn Sie diesen Reiter schließen und die History abgeschaltet haben, ist "
-#~ "die Nachricht verloren."
-#~ msgid "Cannot remove last group"
-#~ msgstr "Letzte Gruppe kann nicht entfernt werden"
-#~ msgid "At least one contact group must be present."
-#~ msgstr "Mindestens eine Gruppe wird benötigt."
-#~ msgid ""
-#~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
-#~ "pysqlite3, if you want to migrate your logs to the new database, please "
-#~ "read: http://trac.gajim.org/wiki/MigrateLogToDot9DB Exiting..."
-#~ msgstr ""
-#~ "pysqlite2 (auch bekannt als python-pysqlite2) Abhängigkeit fehlt. Nachdem "
-#~ "Sie pysqlite2installiert haben, wenn Sie Ihre Logs in die neue Datenbank "
-#~ "migrieren möchte, lesen Siebitte: http://trac.gajim.org/wiki/"
-#~ "MigrateLogToDot9DB Beende ..."
-#~ msgid ""
-#~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
-#~ "24 in height."
-#~ msgstr ""
-#~ "Das Bild darf eine Höhe und Breite von je 24 Pixeln nicht überschreiten."
-#~ msgid "<b>Changes in latest version</b>"
-#~ msgstr "<b>Änderungen in der neuesten Version</b>"
-#~ msgid "Check for new _version on Gajim startup"
-#~ msgstr "Beim Start von Gajim auf neue _Versionen prüfen"
-#~ msgid "Log history"
-#~ msgstr "Log-Verlauf"
-#~ msgid "New version of Gajim available"
-#~ msgstr "Es ist eine neue Version von Gajim verfügbar"
-#~ msgid "Open Download Page"
-#~ msgstr "Download-Seite öffnen"
-#~ msgid "(%s/s)"
-#~ msgstr "(%s/s)"
-#~ msgid "Session bus is not available."
-#~ msgstr "Session-Bus nicht verfügbar."
-#~ msgid "with account "
-#~ msgstr "Konto: "
-#~ msgid "Chat with"
-#~ msgstr "Unterhalten mit"
-#~ msgid "as "
-#~ msgstr "als "
-#~ msgid "Send _New Message"
-#~ msgstr "Sende _neue Nachricht"
-#~ msgid "Re_quest Authorization from"
-#~ msgstr "Autorisierung anfordern"
-#~ msgid "Send Authorization to"
-#~ msgstr "Autorisierung senden"
-#~ msgid "Log presences in _contact's log file"
-#~ msgstr "Anwesenheit in _Kontakt-Logdateien schreiben"
-#~ msgid "Log presences in an _external file"
-#~ msgstr "Anwesenheit in eine _externe Datei speichern"
-#~ msgid ""
-#~ "You can set advanced account options by pressing Advanced button,or later "
-#~ "by clicking in Accounts menuitem under Edit menu from the main window."
-#~ msgstr ""
-#~ "Sie können die erweiterten Konten-Optionen durch Klicken des Erweitert-"
-#~ "Buttons erreichen, oder später durch klicken des Konten Menüitems im "
-#~ "Bearbeiten-Menü."
-#~ msgid ""
-#~ "Set value of 'key' to 'value'. If there is no such key, new item in the "
-#~ "preferences is inserted."
-#~ msgstr ""
-#~ "Setze den Wert von 'key' auf 'value'. Wenn kein solcher key existiert "
-#~ "wirdeine neuer Wert in den Einstellungen erstellt."
-#~ msgid ""
-#~ "When a new message is received which is not from a contact already in a "
-#~ "chat window, the three following actions may happen in order for you to "
-#~ "be informed about it"
-#~ msgstr ""
-#~ "Wenn eine neue Nachricht von einem neuen Kontakt in einem Chatfenster "
-#~ "empfangen wird, können die drei folgenden Aktionen ausgeführt werden, um "
-#~ "Sie darüber zu informieren"
-#~ msgid "_Earliest"
-#~ msgstr "_Erste"
-#~ msgid "_Latest"
-#~ msgstr "_Letzte"
-#~ msgid "Filter query too short"
-#~ msgstr "Filteranfrage zu kurz"
-#~ msgid "Query must be at least 3 characters long."
-#~ msgstr "Anfrage muss wenigstens 3 Zeichen lang sein."
-#~ msgid "%s is now %s: %s"
-#~ msgstr "%s ist jetzt %s (%s)"
-#~ msgid "Allow controlling Gajim via D-Bus service."
-#~ msgstr "Erlaube die Steuerung von Gajim mit dem D-Bus Dienst."
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "== Original Message ==\n"
-#~ "%s"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "== Originalnachricht ==\n"
-#~ "%s"
-#~ msgid ""
-#~ "Your new account has been created successfully.\n"
-#~ "You can set advanced account options by pressing Advanced button,\n"
-#~ "or later by clicking in Accounts menuitem under Edit menu from the main "
-#~ "window."
-#~ msgstr ""
-#~ "Konto wurde erfolgreich hinzugefügt.\n"
-#~ "Erweiterte Optionen sind über \"Ändern->Konten\" zu erreichen."
-#~ msgid ""
-#~ "When we remove a contact, remove both his and our subscription, so we do "
-#~ "not receive his presence anymore and he ours."
-#~ msgstr ""
-#~ "Wenn wir einen Kontakt entfernen, lösche sowohl sein als auch unser "
-#~ "Abonnement, damitwir nicht mehr gegenseitig über die Präsenz informiert "
-#~ "werden"
-#~ msgid ""
-#~ "Should Gajim send inactive (\"is doing something else\") on just focus "
-#~ "out of window/switch to another tab?"
-#~ msgstr ""
-#~ "Soll Gajim Inaktivitätsbenachrichtungen von Tabs im Fokus an andere "
-#~ "Fenster/Tabs senden?"
-#~ msgid ""
-#~ "Your new account has been created and added to your gajim configuration.\n"
-#~ "You can set advanced account options using \"Edit->Accounts\" in the main "
-#~ "window menu."
-#~ msgstr ""
-#~ "Ihr neues Konto wurde erstellt und der Gajimkonfiguration hinzugefügt.\n"
-#~ "Erweiterte Optionen sind über \"Ändern->Konten\" zu erreichen."
-#~ msgid "You need to enter a valid server address to add an account."
-#~ msgstr ""
-#~ "Sie müssen einen gültigen Server angeben, um ein neues Konto zu erstellen."
-#~ msgid "Contact names must be of the form \"user at servername\"."
-#~ msgstr "Benutzernamen müssen die Form \"benutzer at servername\" haben."
-#~ msgid "Invalid contact ID"
-#~ msgstr "Ungültige Benutzer-ID"
-#~ msgid "Contact ID must be of the form \"username at servername\"."
-#~ msgstr "Benutzer-ID muss in der Form \"username at servername\" sein."
-#~ msgid "Account registration successful"
-#~ msgstr "Kontoregistrierung erfolgreich"
-#~ msgid "The account \"%s\" has been registered with the Jabber server."
-#~ msgstr "Konto \"%s\" wurde auf dem Jabberserver registriert."
-#~ msgid "Edit"
-#~ msgstr "_Ändern"
-#~ msgid "Check if you want to register for a new jabber account"
-#~ msgstr "Prüfen Sie, ob Sie ein neues Konto erstellen möchten"
-#~ msgid "Click to get contact's extended information"
-#~ msgstr "Klicken, um erweiterte Informationen des Kontaktes einzusehen"
-#~ msgid "_Compact View"
-#~ msgstr "_Kompakte Ansicht"
-#~ msgid "_Refresh"
-#~ msgstr "_Aktualisieren"
-#~ msgid "_Register new account"
-#~ msgstr "Neues Konto e_rstellen"
-#~ msgid "You just received a new message in room \"%s\""
-#~ msgstr "Sie haben eine neue Nachricht im Raum \"%s\" erhalten"
-#~ msgid ""
-#~ "If you close this window and you have history disabled, this message will "
-#~ "be lost."
-#~ msgstr ""
-#~ "Wenn sie das Fenster schließen und die History abgeschaltet haben, geht "
-#~ "die Nachricht verloren."
-#~ msgid "New _Room"
-#~ msgstr "Neuer _Raum"
-#~ msgid "Always use compact _view"
-#~ msgstr "Benutze immer die kompakte Ansicht"
-#~ msgid "Banner:"
-#~ msgstr "Banner:"
-#~ msgid ""
-#~ "If checked, all chat and group chat windows will have the information "
-#~ "area in the top and the buttons area in the bottom hidden. You can quick "
-#~ "toggle compact view with Alt+C. NOTE: The last state you leave a window/"
-#~ "tab is not a permanent one"
-#~ msgstr ""
-#~ "Wenn aktiviert, werden die Informationsleiste und die Bedienelemente in "
-#~ "den Chat- und Chatraumfenstern ausgeblendet.  Mit Alt+C können Sie "
-#~ "schnell zwischen der kompakten und der normalen Ansicht umschalten. "
-#~ "Achtung: die jeweils letzte Ansicht wird nicht beibehalten"
-#~ msgid "Inactivate account"
-#~ msgstr "Kein aktives Konto"
-#~ msgid "Po_sition:"
-#~ msgstr "Position:"
-#~ msgid "Show roster window on Gajim startup"
-#~ msgstr "Kontaktliste beim Start von Gajim anzeigen"
-#~ msgid "_Service Discovery"
-#~ msgstr "_Dienste durchsuchen"
-#~ msgid "_Service Discovery..."
-#~ msgstr "_Dienste durchsuchen..."
-#~ msgid "error appeared while processing xmpp:"
-#~ msgstr "Fehler während der Verarbeitung von xmpp:"
-#~ msgid ""
-#~ "Cancels the selected file transfer. If there is an incomplete file, kept "
-#~ "in the file system it will be removed. This operation is not reversable"
-#~ msgstr ""
-#~ "Stoppt den ausgewählten Dateitransfer. Unvollständige Dateien werden "
-#~ "gelöscht. Diese Aktion ist nicht rückgangig zu machen."
-#~ msgid "Chan_ge"
-#~ msgstr "_Ändern"
-
+#~ msgid "Name:"
+#~ msgstr "_Name:"

Modified: branches/osx_newbuildsys/po/pl.po
===================================================================
--- branches/osx_newbuildsys/po/pl.po	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/po/pl.po	2009-04-30 17:05:59 UTC (rev 11255)
@@ -9,13 +9,13 @@
 #. replaces_id (uint)
 #. event_id (string)
 #. app_icon (string)
-#: ../src/notify.py:536
+#: ../src/notify.py:563
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-22 18:10+0100\n"
-"PO-Revision-Date: 2009-03-19 20:36+0100\n"
+"POT-Creation-Date: 2009-04-16 10:58+0200\n"
+"PO-Revision-Date: 2009-04-14 10:53+0100\n"
 "Last-Translator: Sławomir Domagała <godlark at gmail.com>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@
 
 #: ../data/glade/account_context_menu.glade.h:2
 msgid "_Add Contact..."
-msgstr "Dod_aj kontakt..."
+msgstr "_Dodaj kontakt..."
 
 #: ../data/glade/account_context_menu.glade.h:3
 #: ../data/glade/roster_window.glade.h:17
@@ -167,7 +167,7 @@
 #: ../data/glade/account_creation_wizard_window.glade.h:23
 #: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
-msgstr "Z_aawansowane"
+msgstr "_Zaawansowane"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "_Finish"
@@ -281,9 +281,9 @@
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1143
-#: ../src/common/helpers.py:1155 ../src/notify.py:532 ../src/notify.py:551
-#: ../src/notify.py:590 ../src/notify.py:602
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1192
+#: ../src/common/helpers.py:1204 ../src/notify.py:559 ../src/notify.py:580
+#: ../src/notify.py:619 ../src/notify.py:631
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -293,8 +293,8 @@
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:21
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2644
-#: ../src/roster_window.py:5194
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2680
+#: ../src/roster_window.py:5226
 msgid "General"
 msgstr "Ogólne"
 
@@ -353,8 +353,8 @@
 msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1570
-#: ../src/config.py:2073
+#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1575
+#: ../src/config.py:2078
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
@@ -365,12 +365,13 @@
 #. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1118
-#: ../src/config.py:1207 ../src/config.py:1475 ../src/config.py:1480
-#: ../src/config.py:1981 ../src/config.py:2059 ../src/config.py:2072
-#: ../src/config.py:3173 ../src/config.py:3241 ../src/dialogs.py:291
-#: ../src/dialogs.py:293 ../src/dialogs.py:519 ../src/roster_window.py:2713
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2724
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1123
+#: ../src/config.py:1212 ../src/config.py:1480 ../src/config.py:1485
+#: ../src/config.py:1986 ../src/config.py:2064 ../src/config.py:2077
+#: ../src/config.py:3166 ../src/config.py:3234 ../src/dialogs.py:293
+#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
+#: ../src/roster_window.py:2750 ../src/roster_window.py:2756
+#: ../src/roster_window.py:2761
 msgid "None"
 msgstr "Żaden"
 
@@ -524,7 +525,7 @@
 "Konieczna stać się może ponowna konfiguracja firewalla."
 
 #: ../data/glade/accounts_window.glade.h:31
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:675
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:754
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -538,7 +539,7 @@
 msgstr "_Połącz konta"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5145
+#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5177
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
@@ -800,7 +801,7 @@
 msgstr "Dowolny status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:215
+#: ../src/common/commands.py:101 ../src/common/helpers.py:216
 msgid "Away"
 msgstr "Zaraz wracam"
 
@@ -817,7 +818,7 @@
 msgstr "rozmawiam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:226
 msgid "Invisible"
 msgstr "Niewidoczny"
 
@@ -826,7 +827,7 @@
 msgstr "Wykonaj komendę"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:198
+#: ../src/common/helpers.py:199
 msgid "Not Available"
 msgstr "Nieobecny"
 
@@ -989,11 +990,19 @@
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Wpisz nowy opis statusu:</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:602
+msgid "Activity:"
+msgstr "Aktywność:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:587
+msgid "Mood:"
+msgstr "Nastrój:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Szablony opisów:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Zapisz jako szablon..."
 
@@ -1057,7 +1066,7 @@
 #: ../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:5841
+#: ../src/roster_window.py:5873
 msgid "_History"
 msgstr "_Historia"
 
@@ -1098,13 +1107,12 @@
 msgstr "Edytuj Grupy"
 
 #: ../data/glade/esession_info_window.glade.h:1
-#, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Opis</b>"
 
 #: ../data/glade/esession_info_window.glade.h:2
 msgid "_Verify"
-msgstr ""
+msgstr "_Weryfikuj"
 
 #: ../data/glade/features_window.glade.h:2
 msgid "<b>List of possible features in Gajim:</b>"
@@ -1202,7 +1210,7 @@
 "Kontakt\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:749
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:762
 msgid "Bold"
 msgstr "Wytłuszczone"
 
@@ -1222,11 +1230,11 @@
 msgid "Gone"
 msgstr "Zniknął"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:750
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:763
 msgid "Italic"
 msgstr "Kursywa"
 
@@ -1330,7 +1338,7 @@
 msgid "Create new post"
 msgstr "Utwórz nowy wpis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:240
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:241
 msgid "From"
 msgstr "Od"
 
@@ -1409,7 +1417,7 @@
 msgid "_Log conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1697
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1777
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
@@ -2014,7 +2022,7 @@
 msgid "Sort contacts by status"
 msgstr "Sortuj kontakty według statusu"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:387
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Status"
 
@@ -2141,14 +2149,12 @@
 msgstr "_Zachowanie okna:"
 
 #: ../data/glade/preferences_window.glade.h:121
-#, fuzzy
 msgid "in _group chats"
 msgstr "Dołącz do _pokoju"
 
 #: ../data/glade/preferences_window.glade.h:122
-#, fuzzy
 msgid "in _roster"
-msgstr "Spoza listy kontaktów"
+msgstr "w _liście kontaktów"
 
 #: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
@@ -2198,7 +2204,7 @@
 msgid "Order:"
 msgstr "Kolejność:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2571
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2651
 msgid "Privacy List"
 msgstr "Lista prywatności"
 
@@ -2402,8 +2408,8 @@
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5182
-#: ../src/roster_window.py:5660 ../src/roster_window.py:5789
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5214
+#: ../src/roster_window.py:5692 ../src/roster_window.py:5821
 msgid "_Remove"
 msgstr "_Usuń"
 
@@ -2425,14 +2431,14 @@
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5732
+#: ../src/roster_window.py:5764
 msgid "Execute Command..."
 msgstr "Wykonaj komendę..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5100 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5132 ../src/roster_window.py:5645
 msgid "In_vite to"
 msgstr "_Zaproś do"
 
@@ -2442,7 +2448,7 @@
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5110 ../src/roster_window.py:5698
+#: ../src/roster_window.py:5142 ../src/roster_window.py:5730
 msgid "Send Cus_tom Status"
 msgstr "Wyślij odrębny status"
 
@@ -2468,8 +2474,8 @@
 msgstr "_Pozwól mu/jej widzieć swój status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5173 ../src/roster_window.py:5650
-#: ../src/roster_window.py:5779
+#: ../src/roster_window.py:5205 ../src/roster_window.py:5682
+#: ../src/roster_window.py:5811
 msgid "_Block"
 msgstr "_Zablokuj"
 
@@ -2495,8 +2501,8 @@
 msgstr "_Autoryzacja"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5167 ../src/roster_window.py:5644
-#: ../src/roster_window.py:5776
+#: ../src/roster_window.py:5199 ../src/roster_window.py:5676
+#: ../src/roster_window.py:5808
 msgid "_Unblock"
 msgstr "_Cofnij blokadę"
 
@@ -2600,7 +2606,7 @@
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5801
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5833
 msgid "_Information"
 msgstr "Informacje o kontakcie"
 
@@ -2833,13 +2839,13 @@
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5633
+#: ../src/roster_window.py:5665
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5759
+#: ../src/roster_window.py:5791
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
@@ -2906,7 +2912,7 @@
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:769
+#: ../src/advanced.py:102 ../src/chat_control.py:782
 msgid "Color"
 msgstr "Kolor"
 
@@ -3036,71 +3042,80 @@
 msgid "Chinese (Ch)"
 msgstr "chiński (Ch)"
 
-#: ../src/chat_control.py:345
+#: ../src/chat_control.py:358
 msgid "Spelling language"
 msgstr "Wybierz słownik"
 
 #. we are not connected
-#: ../src/chat_control.py:368 ../src/chat_control.py:556
+#: ../src/chat_control.py:381 ../src/chat_control.py:569
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:369 ../src/chat_control.py:557
+#: ../src/chat_control.py:382 ../src/chat_control.py:570
 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:751
+#: ../src/chat_control.py:764
 #, fuzzy
 msgid "Underline"
 msgstr "Niezdefiniowany"
 
-#: ../src/chat_control.py:752
+#: ../src/chat_control.py:765
 #, fuzzy
 msgid "Strike"
 msgstr "Ulica:"
 
-#: ../src/chat_control.py:775
+#: ../src/chat_control.py:788
 #, fuzzy
 msgid "Font"
 msgstr "_Czcionka:"
 
-#: ../src/chat_control.py:784
+#: ../src/chat_control.py:797
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informacje o kontakcie"
 
-#: ../src/chat_control.py:1220 ../src/chat_control.py:1623
+#: ../src/chat_control.py:869
+msgid "Really send file?"
+msgstr "Na pewno wysłać ten plik?"
+
+#: ../src/chat_control.py:870
+#, 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:1261 ../src/chat_control.py:1665
 msgid "GPG encryption enabled"
 msgstr "Szyfrowanie GPG włączone"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1250 ../src/chat_control.py:2125
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:56
-#: ../src/common/helpers.py:227 ../src/conversation_textview.py:862
-#: ../src/dialogs.py:900 ../src/dialogs.py:1648 ../src/gajim.py:988
-#: ../src/gajim.py:1720 ../src/normal_control.py:483
-#: ../src/roster_window.py:910 ../src/roster_window.py:1541
-#: ../src/roster_window.py:1543 ../src/roster_window.py:1889
-#: ../src/roster_window.py:3083 ../src/roster_window.py:3109
-#: ../src/roster_window.py:5294 ../src/roster_window.py:5479
+#: ../src/chat_control.py:1291 ../src/chat_control.py:2167
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:57
+#: ../src/common/helpers.py:228 ../src/conversation_textview.py:862
+#: ../src/dialogs.py:979 ../src/dialogs.py:1703 ../src/dialogs.py:1728
+#: ../src/gajim.py:988 ../src/gajim.py:1721 ../src/normal_control.py:483
+#: ../src/roster_window.py:910 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1890
+#: ../src/roster_window.py:3119 ../src/roster_window.py:3145
+#: ../src/roster_window.py:5326 ../src/roster_window.py:5511
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
-#: ../src/chat_control.py:1382 ../src/tooltips.py:627
+#: ../src/chat_control.py:1424 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Nieznany wykonawca"
 
-#: ../src/chat_control.py:1384 ../src/tooltips.py:632
+#: ../src/chat_control.py:1426 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Nieznany tytuł"
 
-#: ../src/chat_control.py:1386 ../src/tooltips.py:637
+#: ../src/chat_control.py:1428 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Nieznany album"
 
-#: ../src/chat_control.py:1390 ../src/tooltips.py:639
-#, fuzzy, python-format
+#: ../src/chat_control.py:1432 ../src/tooltips.py:639
+#, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
@@ -3108,26 +3123,24 @@
 "<b>\"%(title)s\"</b> w wykonaniu <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1395
-#, fuzzy, python-format
+#: ../src/chat_control.py:1437
+#, python-format
 msgid ""
 "%(title)s by %(artist)s\n"
 "from %(source)s"
-msgstr ""
-"\"%(title)s\" w wykonaniu %(artist)s\n"
-"z %(source)s"
+msgstr "\"%(title)s\" w wykonaniu %(artist)sz %(source)s"
 
-#: ../src/chat_control.py:1518
+#: ../src/chat_control.py:1560
 #, 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:1603 ../src/dialogs.py:3912
+#: ../src/chat_control.py:1645 ../src/dialogs.py:3993
 msgid "No GPG key assigned"
 msgstr "Nie ma przypisanego klucza GPG"
 
-#: ../src/chat_control.py:1604
+#: ../src/chat_control.py:1646
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3135,118 +3148,118 @@
 "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:1613
+#: ../src/chat_control.py:1655
 msgid "GPG encryption disabled"
 msgstr "Szyfrowanie GPG wyłączone"
 
-#: ../src/chat_control.py:1639
+#: ../src/chat_control.py:1681
 msgid "Session WILL be logged"
 msgstr "Sesja BĘDZIE logowana"
 
-#: ../src/chat_control.py:1641
+#: ../src/chat_control.py:1683
 msgid "Session WILL NOT be logged"
 msgstr "Sesja NIE BĘDZIE logowana"
 
 #. encryption %s active
-#: ../src/chat_control.py:1655
+#: ../src/chat_control.py:1697
 msgid "is"
 msgstr "jest"
 
-#: ../src/chat_control.py:1655
+#: ../src/chat_control.py:1697
 msgid "is NOT"
 msgstr "NIE jest"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1699
 msgid "will"
 msgstr "będzie"
 
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1699
 msgid "will NOT"
 msgstr "NIE będzie"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1661
+#: ../src/chat_control.py:1703
 msgid "and authenticated"
 msgstr "oraz autoryzowana"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1665
+#: ../src/chat_control.py:1707
 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:1671
+#: ../src/chat_control.py:1713
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
+"%(type)s szyfrowanie %(status)s aktywne %(authenticated)s.\n"
+"Twoja sesja %(logged)s będzie logowana."
 
-#: ../src/chat_control.py:1719
+#: ../src/chat_control.py:1761
 msgid "Command not supported for zeroconf account."
-msgstr ""
+msgstr "Komenda nie jest wspierana dla konta zeroconf."
 
-#: ../src/chat_control.py:1730 ../src/groupchat_control.py:1657
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1644
 #, python-format
 msgid "Commands: %s"
 msgstr "Polecenia: %s"
 
-#: ../src/chat_control.py:1733 ../src/groupchat_control.py:1671
+#: ../src/chat_control.py:1775 ../src/groupchat_control.py:1658
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Użycie: /%s czyście okno tekstowe."
 
-#: ../src/chat_control.py:1736 ../src/groupchat_control.py:1676
+#: ../src/chat_control.py:1778 ../src/groupchat_control.py:1663
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Użycie: /%s ukrywa przyciski czatu."
 
-#: ../src/chat_control.py:1739 ../src/groupchat_control.py:1692
-#, fuzzy, python-format
+#: ../src/chat_control.py:1781 ../src/groupchat_control.py:1679
+#, 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> wysyła działanie do aktualnego pokoju. "
-"Używaj w trzeciej osobie (np. /%(command)s eksploduje.)"
+"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:1744
+#: ../src/chat_control.py:1786
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
 
-#: ../src/chat_control.py:1747
+#: ../src/chat_control.py:1789
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
 
-#: ../src/chat_control.py:1750 ../src/groupchat_control.py:1715
+#: ../src/chat_control.py:1792 ../src/groupchat_control.py:1702
 #, python-format
 msgid "No help info for /%s"
 msgstr "Brak informacji o pomocy dla /%s"
 
-#: ../src/chat_control.py:1883
+#: ../src/chat_control.py:1925
 msgid "Session negotiation cancelled"
 msgstr "Negocjowanie sesji zostało przerwane"
 
-#: ../src/chat_control.py:1890
+#: ../src/chat_control.py:1932
 msgid "This session is encrypted"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/chat_control.py:1893
-#, fuzzy
+#: ../src/chat_control.py:1935
 msgid " and WILL be logged"
-msgstr "Sesja BĘDZIE logowana"
+msgstr "i BĘDZIE logowana"
 
-#: ../src/chat_control.py:1895
-#, fuzzy
+#: ../src/chat_control.py:1937
 msgid " and WILL NOT be logged"
-msgstr "Sesja NIE BĘDZIE logowana"
+msgstr "i NIE BĘDZIE logowana"
 
-#: ../src/chat_control.py:1900
+#: ../src/chat_control.py:1942
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3254,25 +3267,25 @@
 "Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk "
 "tarczy po więcej szczegółów."
 
-#: ../src/chat_control.py:1902
+#: ../src/chat_control.py:1944
 msgid "E2E encryption disabled"
 msgstr "Szyfrowanie E2E wyłączone"
 
-#: ../src/chat_control.py:1936 ../src/chat_control.py:1949
+#: ../src/chat_control.py:1978 ../src/chat_control.py:1991
 msgid "The following message was NOT encrypted"
 msgstr "Ta wiadomość NIE została zaszyfrowana"
 
-#: ../src/chat_control.py:1942
+#: ../src/chat_control.py:1984
 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:2313
+#: ../src/chat_control.py:2358
 #, 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:2314
+#: ../src/chat_control.py:2359
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3280,15 +3293,15 @@
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: ../src/chat_control.py:2462 ../src/common/connection_handlers.py:1972
-#: ../src/common/connection_handlers.py:2018
-#: ../src/common/connection_handlers.py:2206
-#: ../src/common/connection_handlers.py:2339 ../src/common/connection.py:1344
+#: ../src/chat_control.py:2507 ../src/common/connection_handlers.py:1964
+#: ../src/common/connection_handlers.py:2010
+#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2331 ../src/common/connection.py:1344
 #: ../src/gajim.py:158
 msgid "Database Error"
 msgstr "Błąd bazy danych"
 
-#: ../src/chat_control.py:2463
+#: ../src/chat_control.py:2508
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3297,7 +3310,7 @@
 "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:2699
+#: ../src/chat_control.py:2739
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ma teraz status %(status)s"
@@ -3386,9 +3399,9 @@
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:56 ../src/roster_window.py:784
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
-#: ../src/roster_window.py:5070
+#: ../src/common/helpers.py:57 ../src/roster_window.py:784
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5102
 msgid "Groupchats"
 msgstr "Pokoje"
 
@@ -3454,9 +3467,9 @@
 msgstr "Lista (oddzielona spacjami) kolumn (kont lub grup), które są zwinięte."
 
 #. sorted alphanum
-#: ../src/common/config.py:113 ../src/common/config.py:464
-#: ../src/common/optparser.py:221 ../src/common/optparser.py:439
-#: ../src/common/optparser.py:473 ../src/gajim.py:3252
+#: ../src/common/config.py:113 ../src/common/config.py:471
+#: ../src/common/optparser.py:223 ../src/common/optparser.py:441
+#: ../src/common/optparser.py:475 ../src/gajim.py:3281
 msgid "default"
 msgstr "domyślny"
 
@@ -3648,54 +3661,64 @@
 "prowadzona jest na dowolnym pokoju obecnym na tej liście (nazwy pokojów "
 "rozdzielone spacją)."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:193
 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:196
+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 ""
 "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:197
+#: ../src/common/config.py:198
 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:199
+#: ../src/common/config.py:200
 msgid "Notify of events in the system trayicon."
 msgstr "Powiadamiaj o zdarzeniach za pomocą ikony w obszarze powiadamiania."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:206
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:207
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Czy pokazywać rozgraniczenie kart w oknie czatu?"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:208
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:209
 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 "
 "numbers are more secure, but take longer to calculate when you start a "
 "session."
 msgstr ""
+"Lista modp-grup wykorzystywany w Diffie-Hellman, najwyższa preferencja jest "
+"pierwsza, oddzielonych cudzysłowem. Odpowiednie grupy to 1, 2, 5, 14, 15, "
+"16, 17 i 18. Wyższy numery są bardziej bezpiecznie, lecz obliczanie zajmie "
+"więcej czasu podczas rozpoczynania sesji."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:223
 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:223
+#: ../src/common/config.py:224
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3704,14 +3727,14 @@
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
 "systemowa."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:225
 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:225
+#: ../src/common/config.py:226
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3720,7 +3743,7 @@
 "nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
 "motywu."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:227
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3728,11 +3751,11 @@
 "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:231
+#: ../src/common/config.py:232
 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:232
+#: ../src/common/config.py:233
 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."
@@ -3740,7 +3763,7 @@
 "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:233
+#: ../src/common/config.py:234
 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."
@@ -3748,7 +3771,7 @@
 "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:234
+#: ../src/common/config.py:235
 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 "
@@ -3763,30 +3786,30 @@
 "\"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu "
 "użytkownika do pokoju lub jego opuszczeniu."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid "Background color of contacts when they just signed in."
 msgstr "Kolor tła dla logujących się kontaktów."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Background color of contacts when they just signed out."
 msgstr "Kolor tła dla kontaktów w trakcie wylogowywania."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:240
 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:240
+#: ../src/common/config.py:241
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pokazuj awatarów transportów."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:242
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pokazuj okna rostera na pasku zadań."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:243
 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 "
@@ -3796,7 +3819,7 @@
 "niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
 "okna programu."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 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 "
@@ -3807,7 +3830,7 @@
 "wysyłania takiej informacji."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3828,35 +3851,35 @@
 "wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
 "uruchomić program."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 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:249
+#: ../src/common/config.py:250
 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:250
+#: ../src/common/config.py:251
 msgid "Hides the buttons in chat windows."
 msgstr "Ukrywa przyciski w oknie czatu."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:252
 msgid "Hides the banner in a group chat window"
 msgstr "Ukrywa banner w oknie czatu"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Hides the banner in two persons chat window"
 msgstr "Usuwa banner podczas rozmowy dwóch osób"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 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:254
+#: ../src/common/config.py:255
 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."
@@ -3864,15 +3887,15 @@
 "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:255
+#: ../src/common/config.py:256
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Wcięcie stosowane przy łaczeniu tych samych nicków."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
 msgid "Smooth scroll message in conversation window"
 msgstr "Płynne przewijanie w oknie rozmowy"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3880,13 +3903,13 @@
 "Lista kolorów, oddzielonych \":\", które używane będą do kolorowania nicków "
 "w oknach czatu."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 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:259
+#: ../src/common/config.py:260
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3894,7 +3917,7 @@
 "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:260
+#: ../src/common/config.py:261
 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 "
@@ -3905,7 +3928,7 @@
 "ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego "
 "serwera."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3913,7 +3936,7 @@
 "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:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3922,7 +3945,7 @@
 "połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz "
 "grupy"
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3931,7 +3954,7 @@
 "Gajim będzie traktował każdą przychodzącą wiadomość jako czat lub pojedynczą "
 "wiadomość"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3940,7 +3963,7 @@
 "kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu "
 "nie jest już otwarte."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3949,13 +3972,13 @@
 "$$ i $$ do postaci obrazu (z wykorzystaniem dvips) przed wstawieniem ich do "
 "okna rozmowy."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 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:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3963,7 +3986,7 @@
 "Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są "
 "usuwane."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3971,58 +3994,70 @@
 "Po nadaniu wartości True okna powiadomień będą połączone z obszarem "
 "powiadomień."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
-msgstr ""
+msgstr "Wybierz odstęp czasu pomiędzy dwoma sprawdzeniami bezczynności."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
-msgstr ""
+msgstr "Zmień rozmiar pokazywanych formuł latex-a."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
+#, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
+"Wzorce ważnych uri. Tylko wzorce z tej listy będzie przyjmowane jako "
+"\"prawdziwe\" uri."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:273
 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:284
+msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 "Priorytet ulegnie automatycznej zmianie, wraz ze zmianą statusu. Priorytety "
 "zdefiniowane są opcjach rozpoczynających się od autopriority_*."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:292
 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 ""
+"Status używany przy automatycznym połączeniu. Może być: dostępny, chętny do "
+"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:291
+#: ../src/common/config.py:293
 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:296
+#: ../src/common/config.py:298
 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:298
+#: ../src/common/config.py:300
 msgid "Enable ESessions encryption for this account."
-msgstr ""
+msgstr "Włączono szyfrowanie ESession dla tego konta."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:301
 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:300
+#: ../src/common/config.py:302
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4030,22 +4065,22 @@
 "Lista połączeń (rozdzielona spacjami) zawierająca wykaz rodzajów połączeń. "
 "Może zawierać tls, ssl lub plain"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:303
 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:302
+#: ../src/common/config.py:304
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Pokaż ostrzeżenie przed użyciem standardowej biblioteki SSL."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:306
 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:316
+#: ../src/common/config.py:318
 msgid ""
 "How many seconds to wait for the answer of keepalive packet before we try to "
 "reconnect."
@@ -4054,11 +4089,11 @@
 "połączenie przed podjęciem próby ponownego połączenia."
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "Jabberd2 workaround"
 msgstr "Obejście dla Jabberd2"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:326
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4066,15 +4101,15 @@
 "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:338
+#: ../src/common/config.py:340
 msgid "Answer to receipt requests"
-msgstr ""
+msgstr "Odpowiedź na żądanie potwierdzenia"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:341
 msgid "Sent receipt requests"
-msgstr ""
+msgstr "Wyślij żądanie potwierdzenia"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:349
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4082,11 +4117,11 @@
 "Czy podczas negocjowania szyfrowanej sesji Gajim ma przyjąć, że chcesz ją "
 "logować?"
 
-#: ../src/common/config.py:405
+#: ../src/common/config.py:412
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
 
-#: ../src/common/config.py:406
+#: ../src/common/config.py:413
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4094,101 +4129,101 @@
 "Czy Gajim powinien automatycznie rozpoczynać zaszyfrowana sesję z tym "
 "kontaktem, jeśli to możliwe?"
 
-#: ../src/common/config.py:407 ../src/common/config.py:410
+#: ../src/common/config.py:414 ../src/common/config.py:417
 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:416
+#: ../src/common/config.py:423
 msgid "all or space separated status"
 msgstr "all lub komunikaty stanu rozdzielone spacjami"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:424
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' lub 'both'"
 
-#: ../src/common/config.py:418 ../src/common/config.py:420
-#: ../src/common/config.py:421 ../src/common/config.py:424
-#: ../src/common/config.py:425
+#: ../src/common/config.py:425 ../src/common/config.py:427
+#: ../src/common/config.py:428 ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' lub \""
 
-#: ../src/common/config.py:431 ../src/common/pep.py:159
+#: ../src/common/config.py:438 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:439
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:439
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:129
+#: ../src/common/config.py:440 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:440
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:441
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:441
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:435 ../src/common/pep.py:188
+#: ../src/common/config.py:442 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:442
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:443
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:443
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:444
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:444
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:448
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:449
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: ../src/common/config.py:443 ../src/config.py:1407
+#: ../src/common/config.py:450 ../src/config.py:1412
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:451
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:452
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/config.py:446 ../src/common/config.py:447
+#: ../src/common/config.py:453 ../src/common/config.py:454
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:464
 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."
@@ -4197,23 +4232,23 @@
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:465
 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:467 ../src/common/optparser.py:235
+#: ../src/common/config.py:474 ../src/common/optparser.py:237
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:471 ../src/common/optparser.py:221
+#: ../src/common/config.py:478 ../src/common/optparser.py:223
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:482
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:486
 msgid "marine"
 msgstr "morski"
 
@@ -4222,73 +4257,73 @@
 msgid "Unable to load idle module"
 msgstr "Nie można załadować modułu idle"
 
-#: ../src/common/connection_handlers.py:235
+#: ../src/common/connection_handlers.py:236
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Błędna nazwa hosta"
 
-#: ../src/common/connection_handlers.py:236
+#: ../src/common/connection_handlers.py:237
 msgid "Invalid local address? :-O"
 msgstr "Niepoprawny adres lokalny? :-O"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:670
 #, 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:685
+#: ../src/common/connection_handlers.py:677
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Publikacja vCard powiodła się"
 
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:680
 #, fuzzy
 msgid "Registration failed"
 msgstr "Połączenie nie powiodło się"
 
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:680
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:976
-#: ../src/common/connection_handlers.py:1970
-#: ../src/common/connection_handlers.py:2016
-#: ../src/common/connection_handlers.py:2204
-#: ../src/common/connection_handlers.py:2337 ../src/common/connection.py:1342
+#: ../src/common/connection_handlers.py:968
+#: ../src/common/connection_handlers.py:1962
+#: ../src/common/connection_handlers.py:2008
+#: ../src/common/connection_handlers.py:2196
+#: ../src/common/connection_handlers.py:2329 ../src/common/connection.py:1342
 #: ../src/gajim.py:378
 msgid "Disk Write Error"
 msgstr "Błąd zapisu na dysk"
 
-#: ../src/common/connection_handlers.py:1183 ../src/common/connection.py:917
+#: ../src/common/connection_handlers.py:1175 ../src/common/connection.py:917
 msgid "Invisibility not supported"
 msgstr "Niewidoczność nie jest obsługiwana"
 
-#: ../src/common/connection_handlers.py:1184 ../src/common/connection.py:918
+#: ../src/common/connection_handlers.py:1176 ../src/common/connection.py:918
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s nie obsługuje niewidoczności."
 
-#: ../src/common/connection_handlers.py:1798 ../src/common/connection.py:1157
-#: ../src/config.py:1835 ../src/config.py:1843 ../src/config.py:1886
-#: ../src/config.py:3111 ../src/dataforms_widget.py:603 ../src/dialogs.py:2357
+#: ../src/common/connection_handlers.py:1790 ../src/common/connection.py:1157
+#: ../src/config.py:1840 ../src/config.py:1848 ../src/config.py:1891
+#: ../src/config.py:3116 ../src/dataforms_widget.py:571 ../src/dialogs.py:2437
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/common/connection_handlers.py:1799
+#: ../src/common/connection_handlers.py:1791
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1973
-#: ../src/common/connection_handlers.py:2019
-#: ../src/common/connection_handlers.py:2207
-#: ../src/common/connection_handlers.py:2340 ../src/common/connection.py:1345
+#: ../src/common/connection_handlers.py:1965
+#: ../src/common/connection_handlers.py:2011
+#: ../src/common/connection_handlers.py:2199
+#: ../src/common/connection_handlers.py:2332 ../src/common/connection.py:1345
 #: ../src/gajim.py:159
 #, python-format
 msgid ""
@@ -4299,7 +4334,7 @@
 "http://trac.gajim.org/wiki/DatabaseBackup) lub usuń ten plik(całe archiwum "
 "rozmów zostanie usunięte)."
 
-#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2083
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Pseudonim jest niedozwolony: %s"
@@ -4307,70 +4342,70 @@
 #. we are banned
 #. group chat does not exist
 #. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2166
-#: ../src/common/connection_handlers.py:2169
-#: ../src/common/connection_handlers.py:2172
-#: ../src/common/connection_handlers.py:2175
-#: ../src/common/connection_handlers.py:2179 ../src/gajim.py:531
+#: ../src/common/connection_handlers.py:2158
+#: ../src/common/connection_handlers.py:2161
+#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2167
+#: ../src/common/connection_handlers.py:2171 ../src/gajim.py:531
 msgid "Unable to join group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: ../src/common/connection_handlers.py:2167
+#: ../src/common/connection_handlers.py:2159
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zostałeś zabanowany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:2170
+#: ../src/common/connection_handlers.py:2162
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Pokój %s nie istnieje."
 
-#: ../src/common/connection_handlers.py:2173
+#: ../src/common/connection_handlers.py:2165
 msgid "Group chat creation is restricted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: ../src/common/connection_handlers.py:2176
+#: ../src/common/connection_handlers.py:2168
 #, 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:2180
+#: ../src/common/connection_handlers.py:2172
 #, 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:2222
+#: ../src/common/connection_handlers.py:2214
 msgid "Room has been destroyed"
 msgstr "Pokój został usunięty"
 
-#: ../src/common/connection_handlers.py:2229
+#: ../src/common/connection_handlers.py:2221
 #, 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:2256
+#: ../src/common/connection_handlers.py:2248
 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:2277
+#: ../src/common/connection_handlers.py:2269
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection_handlers.py:2279
+#: ../src/common/connection_handlers.py:2271
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection_handlers.py:2281
+#: ../src/common/connection_handlers.py:2273
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection_handlers.py:2464
+#: ../src/common/connection_handlers.py:2456
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4381,15 +4416,15 @@
 "jabberstudio.org/ aby go usunąć"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2489
-#: ../src/common/zeroconf/connection_zeroconf.py:173
+#: ../src/common/connection_handlers.py:2481
+#: ../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:2491
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1930
+#: ../src/common/connection_handlers.py:2483
+#: ../src/common/zeroconf/connection_zeroconf.py:177
+#: ../src/roster_window.py:1931
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
@@ -4523,7 +4558,7 @@
 msgstr "Błąd weryfikacji aplikacji"
 
 #: ../src/common/connection.py:271
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
@@ -4563,7 +4598,7 @@
 
 #: ../src/common/connection.py:629 ../src/common/connection.py:755
 #: ../src/common/connection.py:1478
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:251
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
@@ -4582,9 +4617,9 @@
 msgstr "Połączenie z proxy nie powiodło się"
 
 #: ../src/common/connection.py:679 ../src/common/connection.py:735
-#, fuzzy, python-format
+#, python-format
 msgid "Could not connect to account %s"
-msgstr "Nie można połączyć się z \"%s\""
+msgstr "Nie można połączyć się %s"
 
 #: ../src/common/connection.py:680 ../src/common/connection.py:736
 #, python-format
@@ -4640,20 +4675,20 @@
 "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:1158 ../src/dialogs.py:2358
+#: ../src/common/connection.py:1158 ../src/dialogs.py:2438
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Nie można wysłać pustego pliku"
 
 #: ../src/common/connection.py:1180
-#: ../src/common/zeroconf/connection_zeroconf.py:389
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 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:1182
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:393
 #, 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."
@@ -4665,7 +4700,7 @@
 msgstr "[Ta wiadomość jest zaszyfrowana (Zobacz :XEP: '27']"
 
 #: ../src/common/connection.py:1332
-#: ../src/common/zeroconf/connection_zeroconf.py:468
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4678,16 +4713,16 @@
 msgid "Not fetched because of invisible status"
 msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:56
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:57
 #: ../src/gajim.py:988
 msgid "Observers"
 msgstr "Obserwatorzy"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:56 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/common/helpers.py:57 ../src/disco.py:117 ../src/disco.py:118
 #: ../src/disco.py:1350 ../src/gajim.py:801 ../src/roster_window.py:814
-#: ../src/roster_window.py:1468 ../src/roster_window.py:1537
-#: ../src/roster_window.py:1539 ../src/roster_window.py:1683
+#: ../src/roster_window.py:1469 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1684
 msgid "Transports"
 msgstr "Transporty"
 
@@ -4882,206 +4917,206 @@
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:141
+#: ../src/common/helpers.py:142
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:147
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: ../src/common/helpers.py:152
+#: ../src/common/helpers.py:153
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:160
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
-#: ../src/common/helpers.py:191
+#: ../src/common/helpers.py:192
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:193
+#: ../src/common/helpers.py:194
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:196
+#: ../src/common/helpers.py:197
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:201
+#: ../src/common/helpers.py:202
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:203
+#: ../src/common/helpers.py:204
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:207
 msgid "_Available"
 msgstr "_Dostępny"
 
-#: ../src/common/helpers.py:208 ../src/features_window.py:115
+#: ../src/common/helpers.py:209 ../src/features_window.py:115
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:211
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:214
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:219
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:221
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:224
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:232
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:237
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:239
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:243
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:251
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:253
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:261
+#: ../src/common/helpers.py:262
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:265
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:267
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:270
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:272
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:275
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:277
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:283
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Powiązanie kontaktu z czata: brak"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:285
 msgid "Owner"
 msgstr "Właściciel"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:287
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:289
 msgid "Member"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:326
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:328
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:330
 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:332
+#: ../src/common/helpers.py:333
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:334
+#: ../src/common/helpers.py:335
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:662
+#: ../src/common/helpers.py:663
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:666
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:669
+#: ../src/common/helpers.py:670
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:673
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:676
+#: ../src/common/helpers.py:677
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:679
+#: ../src/common/helpers.py:680
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:682
+#: ../src/common/helpers.py:683
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1092 ../src/common/helpers.py:1099
+#: ../src/common/helpers.py:1141 ../src/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5089,22 +5124,22 @@
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1105
+#: ../src/common/helpers.py:1154
 #, python-format
 msgid " from room %s"
 msgstr " z pokoju %s"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1127
+#: ../src/common/helpers.py:1157 ../src/common/helpers.py:1176
 #, python-format
 msgid " from user %s"
 msgstr " od użytkownika %s"
 
-#: ../src/common/helpers.py:1110
+#: ../src/common/helpers.py:1159
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1117 ../src/common/helpers.py:1124
+#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5112,7 +5147,7 @@
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1157
+#: ../src/common/helpers.py:1206
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5122,17 +5157,22 @@
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Błąd przy wykonywaniu \"%(command)s\": %(error)s"
 
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s nie jest prawidłowym poziomem logowania"
+
 #. we talk about a file
 #: ../src/common/optparser.py:56
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:231
+#: ../src/common/optparser.py:232 ../src/common/optparser.py:233
 msgid "cyan"
 msgstr "cyjan"
 
-#: ../src/common/optparser.py:347
+#: ../src/common/optparser.py:349
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
@@ -5141,645 +5181,631 @@
 msgid "XMPP account %s@%s"
 msgstr "dla konta %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Obawiam się"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Zadziwiony"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Zakochany"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Zły"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Zdenerwowany"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Niecierpliwy"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Podniecony"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Zawstydzony"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Znudzony"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Odważny"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Spokojny"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Ostrożny"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "W złym humorze."
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Pewny siebie"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Zmieszany"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Zamyślony"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Zadowolony"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Zły"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Szalony"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 msgid "Creative"
 msgstr "Twórczy"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr "Ciekawy"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Smutny"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Przygnębiony"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "rozczarowany"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "zniesmaczony"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Przygnębiony"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Roztargniony"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Zażenowany"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Zazdrosny"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Podniecony"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Gotowy do flirtu"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Sfrustrowany"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Wdzięczny"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Zrozpraczony"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Zrzędliwy"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Winny"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Szczęśliwy"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "Pełen nadziei"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Gorący"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Upokorzony"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Poniżony"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Głodny"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "zraniony"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "pod wrażeniem"
 
-#: ../src/common/pep.py:73
-#, fuzzy
+#: ../src/common/pep.py:74
 msgid "In Awe"
-msgstr "wstrząśnięty"
+msgstr "Wstrząśnięty"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Zakochany"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Oburzony"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "zainteresowany"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Pijany"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Niepokonany"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Zazdrosny"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Samotny"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Zagubiony"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Szczęśliwy"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Skromny"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Nastrojowy"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr "Nerwowy"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 msgid "Offended"
 msgstr "Zraniony"
 
-#: ../src/common/pep.py:88
-#, fuzzy
+#: ../src/common/pep.py:89
 msgid "Outraged"
-msgstr "Sfrustrowany"
+msgstr "Oburzony"
 
-#: ../src/common/pep.py:89
-#, fuzzy
+#: ../src/common/pep.py:90
 msgid "Playful"
-msgstr "swawolny"
+msgstr "Wesoły"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Dumny"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Odprężony"
 
-#: ../src/common/pep.py:92
-#, fuzzy
+#: ../src/common/pep.py:93
 msgid "Relieved"
-msgstr "zadowolony"
+msgstr "Podniesiony na duchu"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Skruszony"
 
-#: ../src/common/pep.py:94
-#, fuzzy
+#: ../src/common/pep.py:95
 msgid "Restless"
-msgstr "niespokojny"
+msgstr "Niespokojny"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Smutny"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Sarkastyczny"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Zadowolony"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Poważny"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Zszokowany"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Nieśmiały"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Chory"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Śpiący"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr "Spontaniczny"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 msgid "Stressed"
 msgstr "Zestresowany"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Silny"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Zaskoczony"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Wdzięczny"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Spragniony"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Zmęczony"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Słaby"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Zmartwiony"
 
-#: ../src/common/pep.py:115
-#, fuzzy
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
-msgstr "krzątam_się"
+msgstr "Krzątam się"
 
-#: ../src/common/pep.py:116
-#, fuzzy
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
-msgstr "na_zakupach"
+msgstr "Na zakupach"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Czyszczę"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Gotuję"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Naprawiam"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Zmywam_Naczynia"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Piorę"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Pracuję w ogrodzie"
 
-#: ../src/common/pep.py:123
-#, fuzzy
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Biegam na posyłki"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Wyprowadzam Psa"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Piję"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Hiję_Piwo"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Piję_Kawę"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Piję_Herbatę"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Coś_Przegryzam"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Jem_Śniadanie"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Jem_Obiad"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Jem_Lunch"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Ćwiczę"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Jeżdżę_Na_Rowerze"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Tańczę"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "Wspinam Się"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Jogging"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Uprawiam Sport"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Biegam"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Na nartach"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Pływam"
 
-#: ../src/common/pep.py:143
-#, fuzzy
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Ćwiczę"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Obrażony"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "W_Salonie_Spa"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Myję_Zęby"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "U_Fryzjera"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Golę się"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Biorę Kąpiel"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Biorę Prysznic"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "Na_Spotkaniu"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Dzień_Wolny"
 
-#: ../src/common/pep.py:154
-#, fuzzy
+#: ../src/common/pep.py:155
 msgid "Hanging out"
-msgstr "wałęsam_się"
+msgstr "Wałęsam się"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Ukrywam się"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "Na Wakacjach"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 msgid "Praying"
 msgstr "Modlę się"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "Wakacje Zaplanowane"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Myślę"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Odpoczywam"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Łowię ryby"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Gram"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "wychodzę"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "Bawię się"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Czytam"
 
-#: ../src/common/pep.py:167
-#, fuzzy
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Na próbie"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Na zakupach"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Pale"
 
-#: ../src/common/pep.py:170
-#, fuzzy
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Udzielam się towarzysko"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Opalam się"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Oglądam TV"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Oglądam film."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Rozmawiam"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "W realu(prawdziwym życiu)"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "rozmawiam przez telefon"
 
-#: ../src/common/pep.py:177
-#, fuzzy
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
-msgstr "Rozmawiam przez telefon."
+msgstr "Wideorozmowa"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "W podróży"
 
-#: ../src/common/pep.py:179
-#, fuzzy
+#: ../src/common/pep.py:180
 msgid "Commuting"
-msgstr "w_drodze_do_pracy(domu)"
+msgstr "W drodze do pracy"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "jeżdzę"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "W samochodzie"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "W autobusie"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "W samolocie"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "W pociągu"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "Na wyciecze"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Spaceruje"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "koduję"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "Na spotkaniu"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Uczę się"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "piszę"
 
@@ -5815,15 +5841,15 @@
 "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:216
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 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:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Błąd Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5832,31 +5858,31 @@
 "%s\n"
 "Przesyłanie wiadomości między adresami link-local może nie działać poprawnie."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi lub Bonjour"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Nie można uruchomić usługi lokalnej"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, 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:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Proszę sprawdzić czy uruchomiony jest demon Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie można zmienić statusu konta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5865,20 +5891,20 @@
 "mogła zostać wysłana."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Twoja wiadomość nie mogła zostać wysłana."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 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:586
+#: ../src/common/zeroconf/connection_zeroconf.py:588
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5890,32 +5916,32 @@
 msgid "Error while adding service. %s"
 msgstr "Błąd przy dodawaniu usługi %s"
 
-#: ../src/config.py:151 ../src/config.py:605
+#: ../src/config.py:151 ../src/config.py:610
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../src/config.py:392
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Domyśla wiadomość"
 
-#: ../src/config.py:399
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../src/config.py:441
+#: ../src/config.py:446
 msgid "Always use OS/X default applications"
 msgstr "Zawsze używaj domyślnych apikacji OS X"
 
-#: ../src/config.py:442
+#: ../src/config.py:447
 msgid "Custom"
 msgstr "Własne"
 
-#: ../src/config.py:671 ../src/dialogs.py:1196
+#: ../src/config.py:676 ../src/dialogs.py:1275
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:672
+#: ../src/config.py:677
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5924,213 +5950,213 @@
 "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
 "inny język korzystać z opcji speller_langugage."
 
-#: ../src/config.py:1049
+#: ../src/config.py:1054
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1054
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
 #. Name column
-#: ../src/config.py:1329 ../src/dialogs.py:1823 ../src/dialogs.py:1887
+#: ../src/config.py:1334 ../src/dialogs.py:1903 ../src/dialogs.py:1967
 #: ../src/disco.py:771 ../src/disco.py:1563 ../src/disco.py:1809
 #: ../src/history_window.py:87
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1415
+#: ../src/config.py:1420
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: ../src/config.py:1416
+#: ../src/config.py:1421
 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:1544 ../src/config.py:1645
+#: ../src/config.py:1549 ../src/config.py:1650
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1681 ../src/config.py:1724
+#: ../src/config.py:1686 ../src/config.py:1729
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../src/config.py:1682
+#: ../src/config.py:1687
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
 
-#: ../src/config.py:1708
+#: ../src/config.py:1713
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
 
-#: ../src/config.py:1709
+#: ../src/config.py:1714
 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:1725
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1726
 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:1730
 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:1736
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1732
+#: ../src/config.py:1737
 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:1741 ../src/config.py:1745
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1742
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1741
+#: ../src/config.py:1746
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1816
+#: ../src/config.py:1821
 msgid "Rename Account"
 msgstr "Zmień nazwę konta"
 
-#: ../src/config.py:1817
+#: ../src/config.py:1822
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Wpisz nową nazwę dla kontaktu %s."
 
-#: ../src/config.py:1844
+#: ../src/config.py:1849
 msgid "A Jabber ID must be in the form \"user at servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik at nazwaserwera\"."
 
-#: ../src/config.py:2034 ../src/config.py:3183
+#: ../src/config.py:2039 ../src/config.py:3176
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:2035 ../src/config.py:3184
+#: ../src/config.py:2040 ../src/config.py:3177
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:2056
+#: ../src/config.py:2061
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:2057
+#: ../src/config.py:2062
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:2092
+#: ../src/config.py:2097
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:2093
+#: ../src/config.py:2098
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:2100
+#: ../src/config.py:2105
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2106
 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:2108 ../src/dialogs.py:1675 ../src/dialogs.py:1811
-#: ../src/dialogs.py:1990 ../src/disco.py:439 ../src/profile_window.py:317
+#: ../src/config.py:2113 ../src/dialogs.py:1755 ../src/dialogs.py:1891
+#: ../src/dialogs.py:2070 ../src/disco.py:439 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:2109
+#: ../src/config.py:2114
 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:2113
+#: ../src/config.py:2118
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:2114
+#: ../src/config.py:2119
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:2145
+#: ../src/config.py:2150
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:2146
+#: ../src/config.py:2151
 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:2329
+#: ../src/config.py:2334
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the beginning
-#: ../src/config.py:2367
+#: ../src/config.py:2372
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2368
+#: ../src/config.py:2373
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2369
+#: ../src/config.py:2374
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2370
+#: ../src/config.py:2375
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2419 ../src/disco.py:778 ../src/history_manager.py:183
+#: ../src/config.py:2424 ../src/disco.py:778 ../src/history_manager.py:183
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2429
+#: ../src/config.py:2434
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2436
+#: ../src/config.py:2441
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2442
+#: ../src/config.py:2447
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2469
+#: ../src/config.py:2474
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user at domain if that line is TOO BIG
-#: ../src/config.py:2471
+#: ../src/config.py:2476
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6138,11 +6164,11 @@
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2478
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2474
+#: ../src/config.py:2479
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6150,11 +6176,11 @@
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2476
+#: ../src/config.py:2481
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2477
+#: ../src/config.py:2482
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6162,11 +6188,11 @@
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2484
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2480
+#: ../src/config.py:2485
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6174,7 +6200,7 @@
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2486
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6191,84 +6217,76 @@
 "4. domena (dotyczy domeny a także dowolnego adresu typu użytkownik at domena,\n"
 "domena/zasób lub adresu zawierającego subdomenę)."
 
-#: ../src/config.py:2578
+#: ../src/config.py:2583
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2600 ../src/gajim.py:1471 ../src/gajim.py:1558
+#: ../src/config.py:2605 ../src/gajim.py:1472 ../src/gajim.py:1559
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
 #. ('PASSWORD_REQUIRED', account, None)
-#: ../src/config.py:2601 ../src/gajim.py:1541
+#: ../src/config.py:2606 ../src/gajim.py:1542
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2602 ../src/gajim.py:1558
+#: ../src/config.py:2607 ../src/gajim.py:1559
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2611
+#: ../src/config.py:2616
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2612
+#: ../src/config.py:2617
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2708
+#: ../src/config.py:2713
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:2708
+#: ../src/config.py:2713
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
 
-#: ../src/config.py:2709
+#: ../src/config.py:2714
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 msgid "?print_status:None"
 msgstr "?print_status:Żaden"
 
-#: ../src/config.py:2778
+#: ../src/config.py:2783
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: ../src/config.py:2811
+#: ../src/config.py:2816
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2812
+#: ../src/config.py:2817
 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ę."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3101
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:3122
-msgid "Duplicate Jabber ID"
-msgstr "Taki Jabber ID już istnieje!"
-
-#: ../src/config.py:3123
-msgid "This account is already configured in Gajim."
-msgstr "Konto o takiej nazwie jest już skonfigurowane."
-
-#: ../src/config.py:3140
+#: ../src/config.py:3133
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:3141 ../src/config.py:3332
+#: ../src/config.py:3134 ../src/config.py:3325
 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 "
@@ -6277,27 +6295,27 @@
 "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:3159
+#: ../src/config.py:3152
 msgid "Invalid server"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/config.py:3160
+#: ../src/config.py:3153
 msgid "Please provide a server on which you want to register."
 msgstr "Wpisz adres serwera, na którym chcesz się zarejestrować."
 
-#: ../src/config.py:3211 ../src/gajim.py:2091
+#: ../src/config.py:3204 ../src/gajim.py:2101
 msgid "Certificate Already in File"
 msgstr "Certyfikat znajduje się już w pliku"
 
-#: ../src/config.py:3212 ../src/gajim.py:2092
+#: ../src/config.py:3205 ../src/gajim.py:2102
 #, 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:3280
-#, fuzzy, python-format
+#: ../src/config.py:3273
+#, python-format
 msgid ""
 "<b>Security Warning</b>\n"
 "\n"
@@ -6307,11 +6325,11 @@
 msgstr ""
 "<b>Ostrzeżenie o zabezpieczeniach</b>\n"
 "\n"
-"Autentyczność certyfikatu SSL nie może zostać potwierdzona.\n"
+"Autentyczność certyfikatu SSL od %(hostname)s nie może zostać potwierdzona.\n"
 "Błąd SSL: %(error)s\n"
 "Czy nadal chcesz się połączyć z tym serwerem?"
 
-#: ../src/config.py:3286 ../src/gajim.py:2116
+#: ../src/config.py:3279 ../src/gajim.py:2126
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6322,63 +6340,63 @@
 "Odcisk klucza SHA1 certyfikatu:\n"
 "%s"
 
-#: ../src/config.py:3311 ../src/config.py:3352
+#: ../src/config.py:3304 ../src/config.py:3345
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3331
+#: ../src/config.py:3324
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:3418
+#: ../src/config.py:3411
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3419
+#: ../src/config.py:3412
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/config.py:3572
+#: ../src/config.py:3565
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:3580
+#: ../src/config.py:3573
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:3615
+#: ../src/config.py:3608
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:3616
+#: ../src/config.py:3609
 msgid "Next Message Received Focused"
 msgstr "Otrzymałeś następną wiadomość"
 
-#: ../src/config.py:3618
+#: ../src/config.py:3611
 msgid "Next Message Received Unfocused"
 msgstr "Otrzymałeś następną wiadomość w tle"
 
-#: ../src/config.py:3619
+#: ../src/config.py:3612
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:3620
+#: ../src/config.py:3613
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:3621
+#: ../src/config.py:3614
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:3622
+#: ../src/config.py:3615
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:3623
+#: ../src/config.py:3616
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:3624
+#: ../src/config.py:3617
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
 
@@ -6388,15 +6406,17 @@
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
+"Ta ikona wskazuje, że ta wiadomość jeszcze nie została\n"
+"odebrana. Jeśli ta ikona zostanie przez długi czas,\n"
+"może oznaczać, że wiadomości została zgubiona."
 
 #: ../src/conversation_textview.py:579
-#, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr ""
-"Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju od "
-"momentu gdy ostatni raz zwracałeś/zwracałaś na niego uwagę"
+"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:693
 #, python-format
@@ -6447,20 +6467,20 @@
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:575
 msgid "Jabber ID already in list"
 msgstr "Te JID jest już na liście"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:576
 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:619
+#: ../src/dataforms_widget.py:587
 msgid "new at jabber.id"
 msgstr "nowy at jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:590 ../src/dataforms_widget.py:592
 #, python-format
 msgid "new%d at jabber.id"
 msgstr "nowy%d at jabber.id"
@@ -6483,135 +6503,135 @@
 msgid "In the group"
 msgstr "W grupie"
 
-#: ../src/dialogs.py:276
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "Identyfikator klucza"
 
-#: ../src/dialogs.py:281
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Ustaw Nastrój"
 
-#: ../src/dialogs.py:545
+#: ../src/dialogs.py:536
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:547
+#: ../src/dialogs.py:539
 msgid "Status Message"
 msgstr "Opis statusu"
 
-#: ../src/dialogs.py:659
+#: ../src/dialogs.py:720
 msgid "Overwrite Status Message?"
 msgstr "Zmienić opis statusu?"
 
-#: ../src/dialogs.py:660
+#: ../src/dialogs.py:721
 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:669
+#: ../src/dialogs.py:729
 msgid "Save as Preset Status Message"
 msgstr "Szablony opisów"
 
-#: ../src/dialogs.py:670
+#: ../src/dialogs.py:730
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwę dla tego szablonu"
 
-#: ../src/dialogs.py:676
+#: ../src/dialogs.py:755
 msgid "AIM Address:"
 msgstr "_Adres AIM:"
 
-#: ../src/dialogs.py:677
+#: ../src/dialogs.py:756
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:678
+#: ../src/dialogs.py:757
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:758
 msgid "MSN Address:"
 msgstr "_Adres MSN:"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:759
 msgid "Yahoo! Address:"
 msgstr "Adres _Yahoo:"
 
-#: ../src/dialogs.py:716
+#: ../src/dialogs.py:795
 #, 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:718
+#: ../src/dialogs.py:797
 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:875 ../src/dialogs.py:881 ../src/dialogs.py:886
+#: ../src/dialogs.py:954 ../src/dialogs.py:960 ../src/dialogs.py:965
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:961
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:966
 msgid "You cannot add yourself to your roster."
 msgstr "Ty nie możesz dodać siebie do swojej listy kontaktów."
 
-#: ../src/dialogs.py:901
+#: ../src/dialogs.py:980
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:902
+#: ../src/dialogs.py:981
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:938
+#: ../src/dialogs.py:1017
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1075
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:997
+#: ../src/dialogs.py:1076
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:998
+#: ../src/dialogs.py:1077
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:1008
+#: ../src/dialogs.py:1087
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1089
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:1016
+#: ../src/dialogs.py:1095
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1022
+#: ../src/dialogs.py:1101
 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 at somewhere>
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1114
 msgid "translator-credits"
 msgstr ""
 "Tłumaczenie na język polski: Witold Kieraś\n"
 "Maciej Chojnacki <maciej at chojnacki.name>Sławomir Domagała <godlark at gmail.com>"
 
-#: ../src/dialogs.py:1197
+#: ../src/dialogs.py:1276
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6623,89 +6643,89 @@
 "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:1601
+#: ../src/dialogs.py:1680
 #, 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:1604
+#: ../src/dialogs.py:1683
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:1668 ../src/gajim.py:2756
+#: ../src/dialogs.py:1748 ../src/gajim.py:2773
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1756
 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:1695
+#: ../src/dialogs.py:1775
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:1846
 msgid "Invalid Nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1455
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:1847 ../src/groupchat_control.py:1441
+#: ../src/groupchat_control.py:1725
 msgid "The nickname has not allowed characters."
 msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1908
+#: ../src/dialogs.py:1851 ../src/dialogs.py:1857
+#: ../src/groupchat_control.py:1909
 msgid "Invalid group chat Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1909
+#: ../src/dialogs.py:1852 ../src/dialogs.py:1858
+#: ../src/groupchat_control.py:1910
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:1864
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:1865
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie jest nazwą czatu."
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:1892
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: ../src/dialogs.py:1826
+#: ../src/dialogs.py:1906
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1939
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:1940
 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:1884
+#: ../src/dialogs.py:1964
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:2022
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:2024
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:1945
+#: ../src/dialogs.py:2025
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6714,275 +6734,276 @@
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2343 ../src/dialogs.py:2493
+#: ../src/dialogs.py:2049 ../src/dialogs.py:2423 ../src/dialogs.py:2573
 #: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2344 ../src/dialogs.py:2494
+#: ../src/dialogs.py:2050 ../src/dialogs.py:2424 ../src/dialogs.py:2574
 #: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:2059 ../src/dialogs.py:2062
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:2062
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2071
 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:2010
+#: ../src/dialogs.py:2090
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2090
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2094
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2095
 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:2055 ../src/notify.py:245 ../src/notify.py:474
+#: ../src/dialogs.py:2135 ../src/notify.py:264 ../src/notify.py:505
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:476
+#: ../src/dialogs.py:2137 ../src/notify.py:272 ../src/notify.py:507
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
-#: ../src/dialogs.py:2059 ../src/notify.py:276 ../src/notify.py:478
-#: ../src/osx/growler.py:12
+#. img to display
+#: ../src/dialogs.py:2139 ../src/notify.py:295 ../src/notify.py:349
+#: ../src/notify.py:509 ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:2059 ../src/notify.py:257 ../src/notify.py:478
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2139 ../src/notify.py:276 ../src/notify.py:350
+#: ../src/notify.py:509 ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
 #. private message
-#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:479
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2140 ../src/notify.py:283 ../src/notify.py:350
+#: ../src/notify.py:510 ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1674 ../src/notify.py:488
+#: ../src/dialogs.py:2140 ../src/gajim.py:1675 ../src/notify.py:519
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:2062 ../src/gajim.py:1740 ../src/notify.py:481
+#: ../src/dialogs.py:2142 ../src/gajim.py:1741 ../src/notify.py:512
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:2064 ../src/gajim.py:1640 ../src/gajim.py:1707
-#: ../src/notify.py:483 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2144 ../src/gajim.py:1641 ../src/gajim.py:1708
+#: ../src/notify.py:514 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1782 ../src/gajim.py:1804
-#: ../src/gajim.py:1821 ../src/notify.py:485 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2146 ../src/gajim.py:1783 ../src/gajim.py:1805
+#: ../src/gajim.py:1822 ../src/notify.py:516 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1785 ../src/notify.py:486
+#: ../src/dialogs.py:2147 ../src/gajim.py:1786 ../src/notify.py:517
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1492 ../src/notify.py:490
+#: ../src/dialogs.py:2149 ../src/gajim.py:1493 ../src/notify.py:521
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: ../src/dialogs.py:2071 ../src/notify.py:237 ../src/notify.py:492
+#: ../src/dialogs.py:2151 ../src/notify.py:256 ../src/notify.py:523
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: ../src/dialogs.py:2262 ../src/normal_control.py:241
+#: ../src/dialogs.py:2342 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2264 ../src/normal_control.py:243
+#: ../src/dialogs.py:2344 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2266 ../src/normal_control.py:245
+#: ../src/dialogs.py:2346 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2269 ../src/normal_control.py:248
+#: ../src/dialogs.py:2349 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2292 ../src/normal_control.py:290
+#: ../src/dialogs.py:2372 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2315 ../src/normal_control.py:324
+#: ../src/dialogs.py:2395 ../src/normal_control.py:324
 #, 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:2394 ../src/normal_control.py:692
+#: ../src/dialogs.py:2474 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2395 ../src/normal_control.py:696
+#: ../src/dialogs.py:2475 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:2439
+#: ../src/dialogs.py:2519
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:2441
+#: ../src/dialogs.py:2521
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2645
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2569
+#: ../src/dialogs.py:2649
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:2625
-#, fuzzy, python-format
+#: ../src/dialogs.py:2705
+#, 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:2630
-#, fuzzy, python-format
+#: ../src/dialogs.py:2710
+#, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Kolejność: %(order)s, akcja: %(action)s"
 
-#: ../src/dialogs.py:2672
+#: ../src/dialogs.py:2752
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:2759
+#: ../src/dialogs.py:2839
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:2855
+#: ../src/dialogs.py:2935
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:2857
+#: ../src/dialogs.py:2937
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: ../src/dialogs.py:2927
+#: ../src/dialogs.py:3007
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: ../src/dialogs.py:2928
+#: ../src/dialogs.py:3008
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:3040
 msgid "You are invited to a groupchat"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3043
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasza cię do rozmowy"
 
-#: ../src/dialogs.py:2965
+#: ../src/dialogs.py:3045
 #, 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:2973
+#: ../src/dialogs.py:3053
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:2975
+#: ../src/dialogs.py:3055
 msgid "Do you want to accept the invitation?"
 msgstr "Czy chcesz zaakceptować zaproszenie?"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3111
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:3040 ../src/dialogs.py:3091
+#: ../src/dialogs.py:3121 ../src/dialogs.py:3172
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:3045
+#: ../src/dialogs.py:3126
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:3078
+#: ../src/dialogs.py:3159
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:3096
+#: ../src/dialogs.py:3177
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:3161
+#: ../src/dialogs.py:3242
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:3163
+#: ../src/dialogs.py:3244
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
 #. # means number
-#: ../src/dialogs.py:3232
+#: ../src/dialogs.py:3313
 msgid "#"
 msgstr "Nr"
 
-#: ../src/dialogs.py:3238
+#: ../src/dialogs.py:3319
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3437
 msgid "when I am "
 msgstr "kiedy mam "
 
-#: ../src/dialogs.py:3828
+#: ../src/dialogs.py:3909
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6993,39 +7014,41 @@
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3832
+#: ../src/dialogs.py:3913
 msgid "You have already verified this contact's identity."
 msgstr "Już zweryfikowałeś tożsamość tego kontaktu."
 
-#: ../src/dialogs.py:3838 ../src/dialogs.py:3925
+#: ../src/dialogs.py:3919 ../src/dialogs.py:4006
 msgid "Contact's identity verified"
 msgstr "Tożsamość rozmówcy zweryfikowana"
 
-#: ../src/dialogs.py:3846
+#: ../src/dialogs.py:3927
 msgid "Verify again..."
 msgstr "Ponowna weryfikacja..."
 
-#: ../src/dialogs.py:3851
+#: ../src/dialogs.py:3932
 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 ""
+"Aby być pewnym, że <b>tylko</b> oczekiwane osoby będą mogły czytać twoje "
+"wiadomości lub wysyłać wiadomości do ciebie, powinieneś zweryfikować ich "
+"tożsamość poprzez kliknięcie przycisku poniżej."
 
-#: ../src/dialogs.py:3854 ../src/dialogs.py:3906 ../src/dialogs.py:3919
+#: ../src/dialogs.py:3935 ../src/dialogs.py:3987 ../src/dialogs.py:4000
 msgid "Contact's identity NOT verified"
 msgstr "Tożsamość rozmówcy NIE zweryfikowana"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:3942
 msgid "Verify..."
 msgstr "Weryfikowanie..."
 
-#: ../src/dialogs.py:3873
-#, fuzzy
+#: ../src/dialogs.py:3954
 msgid "Have you verified the contact's identity?"
-msgstr "Czy zweryfikowałeś(aś) tożsamość zdalnego rozmówcy?"
+msgstr "Czy zweryfikowałeś/zweryfikowałaś tożsamość zdalnego rozmówcy?"
 
-#: ../src/dialogs.py:3874
+#: ../src/dialogs.py:3955
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7034,24 +7057,28 @@
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
+"Aby uniemożliwić rozmowę z nieznaną osobą, powinieneś porozmawiać z <b>%(jid)"
+"s</b> bezpośrednio(np. przez telefon) i zweryfikować jej tożsamość, ta osoba "
+"zobaczy ten sam Short Authentication String (SAS) jak ty.\n"
+"Tej sesji Short Authentication String to <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3875
+#: ../src/dialogs.py:3956
 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:3907
+#: ../src/dialogs.py:3988
 #, 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:3913
+#: ../src/dialogs.py:3994
 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:3920
+#: ../src/dialogs.py:4001
 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."
@@ -7060,11 +7087,13 @@
 "klucza</b>, więc wiadomość <b>nie będzie</b> odszyfrowana. Użyj twojego "
 "klienta GPG, aby importować klucz."
 
-#: ../src/dialogs.py:3926
+#: ../src/dialogs.py:4007
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
+"Ten użytkownik ma przypisany klucz, zweryfikowałeś ten klucz, więc "
+"wiadomości będą szyfrowane"
 
 #: ../src/disco.py:116
 msgid "Others"
@@ -7373,22 +7402,20 @@
 msgstr "Przekształcanie wyrażeń jezyka LaTeX pomiędzy $$ $$."
 
 #: ../src/features_window.py:95
-#, fuzzy
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
-"Wymaga texlive-latex-ase, dvips oraz imagemagick. Musisz ustawić zmienną "
-"'use_latex' na 'True'."
+"Wymaga texlive-latex-base, dvipng. Musisz ustawić zmienną 'use_latex' na "
+"'True'  w Zaawansowanym Edytorze Ustawień."
 
 #: ../src/features_window.py:96
-#, fuzzy
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
-"Wymaga texlive-latex-ase, dvips oraz imagemagick. Musisz ustawić zmienną "
-"'use_latex' na 'True'."
+"Wymaga texlive-latex-base, dvipng (Wszystko jest w MikTeX). Musisz ustawić "
+"zmienną 'use_latex' na 'True' w Zaawansowanym Edytorze Ustawień."
 
 #: ../src/features_window.py:97
 #, fuzzy
@@ -7739,11 +7766,11 @@
 msgstr "Czy akceptujesz tę prośbę na koncie %s?"
 
 #: ../src/gajim.py:551
-#, fuzzy, python-format
+#, 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:602 ../src/notify.py:494 ../src/osx/growler.py:17
+#: ../src/gajim.py:602 ../src/notify.py:525 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Połączenie nie powiodło się"
 
@@ -7758,7 +7785,7 @@
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:977 ../src/notify.py:496
+#: ../src/gajim.py:977 ../src/notify.py:527
 #, fuzzy
 msgid "Subscription request"
 msgstr "Prośba o autoryzację"
@@ -7785,7 +7812,7 @@
 "Zawsze będziesz widział ten kontakt jako rozłączony.\n"
 "Czy chcesz go usunąć z listy kontaktów?"
 
-#: ../src/gajim.py:1041 ../src/notify.py:498
+#: ../src/gajim.py:1041 ../src/notify.py:529
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Cofnij autoryzację"
@@ -7795,67 +7822,67 @@
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gajim.py:1270 ../src/groupchat_control.py:1166
+#: ../src/gajim.py:1271 ../src/groupchat_control.py:1152
 #, 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:1288 ../src/groupchat_control.py:1341
-#: ../src/history_window.py:428 ../src/notify.py:232
+#: ../src/gajim.py:1289 ../src/groupchat_control.py:1327
+#: ../src/history_window.py:428 ../src/notify.py:251
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ma teraz status %(status)s"
 
-#: ../src/gajim.py:1355
+#: ../src/gajim.py:1356
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
+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:1419 ../src/groupchat_control.py:1126
+#: ../src/gajim.py:1420 ../src/groupchat_control.py:1112
 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:1422
+#: ../src/gajim.py:1423
 msgid "Room now shows unavailable member"
 msgstr "Lista zawiera teraz niedostępnych uczestników"
 
-#: ../src/gajim.py:1424
+#: ../src/gajim.py:1425
 msgid "room now does not show unavailable members"
 msgstr "lista nie zawiera teraz niedostępnych użytkowników"
 
-#: ../src/gajim.py:1427
+#: ../src/gajim.py:1428
 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:1430
+#: ../src/gajim.py:1431
 msgid "Room logging is now enabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1433
 msgid "Room logging is now disabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
 
-#: ../src/gajim.py:1434
+#: ../src/gajim.py:1435
 msgid "Room is now non-anonymous"
 msgstr "Pokój nie jest już anonimowy"
 
-#: ../src/gajim.py:1437
+#: ../src/gajim.py:1438
 msgid "Room is now semi-anonymous"
 msgstr "Pokój jest teraz quasi-anonimowy"
 
-#: ../src/gajim.py:1440
+#: ../src/gajim.py:1441
 msgid "Room is now fully-anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: ../src/gajim.py:1472
+#: ../src/gajim.py:1473
 #, 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:1506
+#: ../src/gajim.py:1507
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7863,20 +7890,20 @@
 "Skonfigurowałeś Gajima by używał agenta GPG, ale agent nie jest uruchomiony "
 "lub zwraca błędne hasło.\n"
 
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1509
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
-#: ../src/gajim.py:1511
+#: ../src/gajim.py:1512
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne"
 
-#: ../src/gajim.py:1534
+#: ../src/gajim.py:1535
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG nie nadaje się do użycia"
 
-#: ../src/gajim.py:1534
+#: ../src/gajim.py:1535
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7885,12 +7912,13 @@
 "Nie ma klucza GPG przypisanego do tego kontaktu. Więc nie możesz szyfrować "
 "wiadomości do niego, używając GPG."
 
-#: ../src/gajim.py:1536 ../src/gajim.py:2174 ../src/gajim.py:2209
-#: ../src/groupchat_control.py:1849 ../src/roster_window.py:3826
+#: ../src/gajim.py:1537 ../src/gajim.py:2184 ../src/gajim.py:2219
+#: ../src/groupchat_control.py:1850 ../src/message_window.py:217
+#: ../src/roster_window.py:3866
 msgid "Do _not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie"
 
-#: ../src/gajim.py:1544
+#: ../src/gajim.py:1545
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7899,12 +7927,12 @@
 "Menedżer bazy kluczy GNOME jest zainstalowany, ale nie został prawidłowo "
 "uruchomiony\t\t\t\t\t\t\t\t(prawodpodobnie niepoprawna zmienna środowiskowa"
 
-#: ../src/gajim.py:1651
+#: ../src/gajim.py:1652
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1653
+#: ../src/gajim.py:1654
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7912,7 +7940,7 @@
 msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe"
 msgstr[2] "Masz %d nieprzeczytane wiadomości pocztowe"
 
-#: ../src/gajim.py:1666
+#: ../src/gajim.py:1667
 #, python-format
 msgid ""
 "\n"
@@ -7927,34 +7955,34 @@
 "Temat: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1737
+#: ../src/gajim.py:1738
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: ../src/gajim.py:1805
+#: ../src/gajim.py:1806
 #, 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:1809
+#: ../src/gajim.py:1810
 #, 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:1822
+#: ../src/gajim.py:1823
 #, 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:1826
+#: ../src/gajim.py:1827
 #, 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:1914
+#: ../src/gajim.py:1924
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7963,36 +7991,36 @@
 "Nie można odszyfrować wiadomości od %s\n"
 "To mogło być sfałszowane."
 
-#: ../src/gajim.py:1921
+#: ../src/gajim.py:1931
 msgid "Unable to decrypt message"
 msgstr "Nie można odszyfrować wiadomości"
 
-#: ../src/gajim.py:1995
+#: ../src/gajim.py:2005
 msgid "Username Conflict"
 msgstr "Konflikt nazw użytkownika"
 
-#: ../src/gajim.py:1996
+#: ../src/gajim.py:2006
 msgid "Please type a new username for your local account"
 msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
 
-#: ../src/gajim.py:2008
+#: ../src/gajim.py:2018
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2021
+#: ../src/gajim.py:2031
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2032
+#: ../src/gajim.py:2042
 msgid "Error."
 msgstr "Błąd."
 
-#: ../src/gajim.py:2057
+#: ../src/gajim.py:2067
 msgid "Resource Conflict"
 msgstr "Konflikt zasobów"
 
-#: ../src/gajim.py:2058
+#: ../src/gajim.py:2068
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8000,27 +8028,30 @@
 "Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę "
 "podać nowy zasób"
 
-#: ../src/gajim.py:2113
+#: ../src/gajim.py:2123
 msgid "Error verifying SSL certificate"
 msgstr "Błąd podczas weryfikacji certyfikatu SSL"
 
-#: ../src/gajim.py:2114
+#: ../src/gajim.py:2124
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
 "(error)s\n"
 "Do you still want to connect to this server?"
 msgstr ""
+"Wystąpił błąd podczas weryfikowania certyfikatu SSL twojego serwera: %(error)"
+"s\n"
+"Czy ciagle chcesz się połączyć z serwerem?"
 
-#: ../src/gajim.py:2119
+#: ../src/gajim.py:2129
 msgid "Ignore this error for this certificate."
 msgstr "Ignoruj komunikat o tym błędzie."
 
-#: ../src/gajim.py:2139
+#: ../src/gajim.py:2149
 msgid "SSL certificate error"
 msgstr "Błąd certyfikatu SSL"
 
-#: ../src/gajim.py:2140
+#: ../src/gajim.py:2150
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8030,17 +8061,17 @@
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
-"Certyfikat SSL uległ zmianie, lub połączenie to jest podsłuchiwane.\n"
+"Certyfikat SSL uległ zmianie lub połączenie to jest podsłuchiwane.\n"
 "Poprzedni odcisk klucza: %(old)s\n"
 "Nowy odcisk klucza: %(new)s\n"
 "\n"
 "Czy nadal chcesz połączyć się i zaktualizować odcisk klucza certyfikatu?"
 
-#: ../src/gajim.py:2170 ../src/gajim.py:2205
+#: ../src/gajim.py:2180 ../src/gajim.py:2215
 msgid "Insecure connection"
 msgstr "Niezabezpieczone połączenie"
 
-#: ../src/gajim.py:2171
+#: ../src/gajim.py:2181
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8048,11 +8079,11 @@
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie.Czy jesteś "
 "pewien?"
 
-#: ../src/gajim.py:2173 ../src/gajim.py:2208
+#: ../src/gajim.py:2183 ../src/gajim.py:2218
 msgid "Yes, I really want to connect insecurely"
 msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
 
-#: ../src/gajim.py:2206
+#: ../src/gajim.py:2216
 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?"
@@ -8060,21 +8091,21 @@
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. "
 "Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
 
-#: ../src/gajim.py:2226
+#: ../src/gajim.py:2236
 msgid "PEP node was not removed"
 msgstr "Węzeł PEP nie został usunięty"
 
-#: ../src/gajim.py:2227
-#, fuzzy, python-format
+#: ../src/gajim.py:2237
+#, 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:2713 ../src/gajim.py:2735
+#: ../src/gajim.py:2730 ../src/gajim.py:2752
 msgid "Emoticons disabled"
 msgstr "Emotoikony wyłączone"
 
-#: ../src/gajim.py:2714
+#: ../src/gajim.py:2731
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8082,7 +8113,7 @@
 "Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą "
 "wyłączone."
 
-#: ../src/gajim.py:2736
+#: ../src/gajim.py:2753
 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 "
@@ -8092,30 +8123,30 @@
 "potrzebować aktualizacji  formatu pliku emoticons.file. Aby poznać więcej "
 "szczegółów, zobacz http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2762 ../src/roster_window.py:3314
+#: ../src/gajim.py:2779 ../src/roster_window.py:3354
 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:3040
+#: ../src/gajim.py:3062
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji"
 
-#: ../src/gajim.py:3137
+#: ../src/gajim.py:3159
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/gajim.py:3138
+#: ../src/gajim.py:3160
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
 
-#: ../src/gajim.py:3151
+#: ../src/gajim.py:3173
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/gajim.py:3152
+#: ../src/gajim.py:3174
 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."
 
@@ -8399,10 +8430,9 @@
 
 #: ../src/gajim-remote.py:261
 msgid "URI to handle"
-msgstr ""
+msgstr "URI do obsługi"
 
 #: ../src/gajim-remote.py:262
-#, fuzzy
 msgid "Account in which you want to handle it"
 msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
 
@@ -8415,7 +8445,6 @@
 msgstr "pokój"
 
 #: ../src/gajim-remote.py:269
-#, fuzzy
 msgid "Room JID"
 msgstr "Pokój:"
 
@@ -8424,9 +8453,8 @@
 msgstr "nick"
 
 #: ../src/gajim-remote.py:270
-#, fuzzy
 msgid "Nickname to use"
-msgstr "Pseudonim nie został odnaleziony: %s"
+msgstr "Nick"
 
 #: ../src/gajim-remote.py:271
 msgid "password"
@@ -8445,9 +8473,8 @@
 msgstr "Proszę sprawdzić czy Gajim jest uruchomiony."
 
 #: ../src/gajim-remote.py:281
-#, fuzzy
 msgid "Shows or hides the ipython window"
-msgstr "Pokazuje lub ukrywa okno listy kontaktów"
+msgstr "Pokazuje lub ukrywa okno iptyhon"
 
 #: ../src/gajim-remote.py:308
 msgid "Missing argument \"contact_jid\""
@@ -8476,6 +8503,8 @@
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
+"Użyto: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
 #: ../src/gajim-remote.py:409
 msgid "Arguments:"
@@ -8505,7 +8534,7 @@
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
 #: ../src/gajim-remote.py:487
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
@@ -8564,126 +8593,121 @@
 msgid "Continued conversation"
 msgstr "Kontynuacja rozmowy"
 
-#: ../src/groupchat_control.py:1014
-msgid "Really send file?"
-msgstr "Na pewno wysłać ten plik?"
-
-#: ../src/groupchat_control.py:1015
-#, 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."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1115
 msgid "Room logging is enabled"
 msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
 
-#: ../src/groupchat_control.py:1131
+#: ../src/groupchat_control.py:1117
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: ../src/groupchat_control.py:1134
+#: ../src/groupchat_control.py:1120
 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:1140
+#: ../src/groupchat_control.py:1126
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1130
 #, 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:1151
+#: ../src/groupchat_control.py:1137
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:1155
+#: ../src/groupchat_control.py:1141
 #, 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:1164
+#: ../src/groupchat_control.py:1150
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:1202 ../src/groupchat_control.py:1206
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1188 ../src/groupchat_control.py:1192
+#: ../src/groupchat_control.py:1197
 #, 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:1203
+#: ../src/groupchat_control.py:1189
 msgid "affiliation changed"
 msgstr "afiliacja została zmieniona "
 
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1194
 msgid "room configuration changed to members-only"
 msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1199
 msgid "system shutdown"
 msgstr "zamknięcie systemu"
 
-#: ../src/groupchat_control.py:1282
+#: ../src/groupchat_control.py:1268
 #, 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:1286
+#: ../src/groupchat_control.py:1272
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
-msgstr ""
+msgstr "** Grupa użytkownika %(nick)s została ustawiona na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1301
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1287
+#, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
-msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s"
+msgstr ""
+"** Uprawnienia użytkownika %(nick)s zostały zmieniona na %(role)s przez %"
+"(actor)s"
 
-#: ../src/groupchat_control.py:1305
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1291
+#, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
-msgstr "%(nick)s został wyrzucony: %(reason)s"
+msgstr "** Uprawnienia użytkownika %(nick)s została zmienione na %(role)s"
 
-#: ../src/groupchat_control.py:1334
+#: ../src/groupchat_control.py:1320
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:1339
+#: ../src/groupchat_control.py:1325
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1737
+#: ../src/groupchat_control.py:1440 ../src/groupchat_control.py:1724
 msgid "Invalid nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/groupchat_control.py:1478 ../src/groupchat_control.py:1496
-#: ../src/groupchat_control.py:1582 ../src/groupchat_control.py:1599
+#: ../src/groupchat_control.py:1465 ../src/groupchat_control.py:1483
+#: ../src/groupchat_control.py:1569 ../src/groupchat_control.py:1586
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: ../src/groupchat_control.py:1512
+#: ../src/groupchat_control.py:1499
 msgid "This group chat has no subject"
 msgstr "Ten pokój nie ma tematu"
 
-#: ../src/groupchat_control.py:1524
+#: ../src/groupchat_control.py:1511
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
-#: ../src/groupchat_control.py:1660
+#: ../src/groupchat_control.py:1647
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8695,14 +8719,14 @@
 "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:1667
+#: ../src/groupchat_control.py:1654
 #, 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:1673
+#: ../src/groupchat_control.py:1660
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8711,7 +8735,7 @@
 "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli "
 "został podany."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1666
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8720,7 +8744,7 @@
 "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
 "wyświetlając powód."
 
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1670
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room at server optionally "
@@ -8729,7 +8753,7 @@
 "Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do "
 "pokój at serwer opcjonalnie z wykorzystaniem podanego psedonimu."
 
-#: ../src/groupchat_control.py:1687
+#: ../src/groupchat_control.py:1674
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8739,7 +8763,7 @@
 "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:1696
+#: ../src/groupchat_control.py:1683
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8748,61 +8772,61 @@
 "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
 "wysyła ją do osoby o takim pseudonimie."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1688
 #, 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:1705
+#: ../src/groupchat_control.py:1692
 #, 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:1709
+#: ../src/groupchat_control.py:1696
 #, 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:1712
+#: ../src/groupchat_control.py:1699
 #, 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:1843
+#: ../src/groupchat_control.py:1844
 #, 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:1845
+#: ../src/groupchat_control.py:1846
 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:1882
+#: ../src/groupchat_control.py:1883
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1883
+#: ../src/groupchat_control.py:1884
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1887
+#: ../src/groupchat_control.py:1888
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1888
+#: ../src/groupchat_control.py:1889
 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:1915
+#: ../src/groupchat_control.py:1916
 #, python-format
 msgid "Destroying %s"
 msgstr "Usuwam pokój %s"
 
-#: ../src/groupchat_control.py:1916
+#: ../src/groupchat_control.py:1917
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8810,22 +8834,22 @@
 "Zamierzasz całkowicie usunąć ten pokój. \n"
 "Poniżej możesz podać powód swojej decyzji:"
 
-#: ../src/groupchat_control.py:1918
+#: ../src/groupchat_control.py:1919
 msgid "You may also enter an alternate venue:"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2089
+#: ../src/groupchat_control.py:2090
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:2090 ../src/groupchat_control.py:2381
+#: ../src/groupchat_control.py:2091 ../src/groupchat_control.py:2382
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2380
+#: ../src/groupchat_control.py:2381
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -8982,9 +9006,8 @@
 msgstr "Historia rozmowy z %s"
 
 #: ../src/history_window.py:343
-#, fuzzy
 msgid "Disk Error"
-msgstr "Błąd zapisu na dysk"
+msgstr "Błąd zapisu lub odczytu na dysku"
 
 #: ../src/history_window.py:424
 #, python-format
@@ -9009,19 +9032,29 @@
 msgid "Image is too big"
 msgstr "Obraz jest za duży"
 
-#: ../src/message_window.py:443
+#: ../src/message_window.py:215
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Nie jesteś połączony z serwerem"
+
+#: ../src/message_window.py:216
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Czy na pewno chcesz usunąć wybraną wiadomość?"
+
+#: ../src/message_window.py:457
 msgid "Chats"
 msgstr "Rozmowy"
 
-#: ../src/message_window.py:445
+#: ../src/message_window.py:459
 msgid "Group Chats"
 msgstr "Czaty"
 
-#: ../src/message_window.py:447
+#: ../src/message_window.py:461
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: ../src/message_window.py:453
+#: ../src/message_window.py:467
 msgid "Messages"
 msgstr "Wiadomości"
 
@@ -9033,47 +9066,47 @@
 msgid "- messages will not be logged"
 msgstr "- wiadomości nie będzie logowanych"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:249
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmienił status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:259
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s połączył(a) się"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:267
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s rozłączył(a) się"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:287
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nowa wiadomość prywatna z pokoju %s"
 
-#: ../src/notify.py:270
+#: ../src/notify.py:289
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:273
+#: ../src/notify.py:292
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:298
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:530
+#: ../src/notify.py:567
 #, fuzzy
 msgid "Ignore"
 msgstr "Ignoruj"
@@ -9086,18 +9119,18 @@
 msgid "Retrieving profile..."
 msgstr "Pobieranie profilu..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2758
+#: ../src/profile_window.py:108 ../src/roster_window.py:2795
 msgid "File is empty"
 msgstr "Plik jest pusty"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2761
+#: ../src/profile_window.py:111 ../src/roster_window.py:2798
 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:2763 ../src/roster_window.py:2774
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2811
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
@@ -9133,44 +9166,44 @@
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:1869
+#: ../src/roster_window.py:1870
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1871
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1890
+#: ../src/roster_window.py:1891
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: ../src/roster_window.py:1891
+#: ../src/roster_window.py:1892
 #, 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:1903
+#: ../src/roster_window.py:1904
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1904
+#: ../src/roster_window.py:1905
 #, 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:1929
+#: ../src/roster_window.py:1930
 msgid "GPG is not usable"
 msgstr "GPG nie nadaje się do użycia"
 
-#: ../src/roster_window.py:2093 ../src/roster_window.py:3258
+#: ../src/roster_window.py:2128 ../src/roster_window.py:3297
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:2094 ../src/roster_window.py:3259
+#: ../src/roster_window.py:2129 ../src/roster_window.py:3298
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9178,15 +9211,15 @@
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:2120
+#: ../src/roster_window.py:2155
 msgid "desync'ed"
 msgstr "rozsynchronizowany"
 
-#: ../src/roster_window.py:2258 ../src/roster_window.py:2495
+#: ../src/roster_window.py:2294 ../src/roster_window.py:2531
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2295
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9194,16 +9227,16 @@
 "Wiadomości będą dostępne do odczytania ich później, tylko wtedy, gdy masz "
 "włączoną obsługę historii."
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2532
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: ../src/roster_window.py:2499
+#: ../src/roster_window.py:2535
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:2500
+#: ../src/roster_window.py:2536
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9211,11 +9244,11 @@
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "tego transportu."
 
-#: ../src/roster_window.py:2503
+#: ../src/roster_window.py:2539
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: ../src/roster_window.py:2508
+#: ../src/roster_window.py:2544
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9225,57 +9258,56 @@
 "następujących transportów: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2639
+#: ../src/roster_window.py:2675
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: ../src/roster_window.py:2640
+#: ../src/roster_window.py:2676
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwę dla kontaktu %s."
 
-#: ../src/roster_window.py:2647
+#: ../src/roster_window.py:2683
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: ../src/roster_window.py:2648
+#: ../src/roster_window.py:2684
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nową nazwę dla grupy %s."
 
-#: ../src/roster_window.py:2704
+#: ../src/roster_window.py:2741
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: ../src/roster_window.py:2705
+#: ../src/roster_window.py:2742
 #, 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:2706
-#, fuzzy
+#: ../src/roster_window.py:2743
 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:2745
+#: ../src/roster_window.py:2782
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:2783
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:3099
+#: ../src/roster_window.py:3135
 #, 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:3101
+#: ../src/roster_window.py:3137
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3106
+#: ../src/roster_window.py:3142
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9284,11 +9316,11 @@
 "będzie zawsze widział Cię jako rozłączonego."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3112
+#: ../src/roster_window.py:3148
 msgid "Do you want to continue?"
 msgstr "Czy chcesz kontynuować?"
 
-#: ../src/roster_window.py:3115
+#: ../src/roster_window.py:3151
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9296,16 +9328,16 @@
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:3118
+#: ../src/roster_window.py:3154
 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:3122
+#: ../src/roster_window.py:3158
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: ../src/roster_window.py:3127
+#: ../src/roster_window.py:3163
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9315,19 +9347,19 @@
 "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
 "jako rozłączony."
 
-#: ../src/roster_window.py:3182
+#: ../src/roster_window.py:3218
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:3183
+#: ../src/roster_window.py:3219
 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:3733
+#: ../src/roster_window.py:3773
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: ../src/roster_window.py:3735
+#: ../src/roster_window.py:3775
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9335,12 +9367,12 @@
 "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
 "zostanie przywrócona podczas następnego połączenia."
 
-#: ../src/roster_window.py:3820
+#: ../src/roster_window.py:3860
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: ../src/roster_window.py:3822
+#: ../src/roster_window.py:3862
 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 "
@@ -9350,11 +9382,11 @@
 "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:3935
+#: ../src/roster_window.py:3975
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: ../src/roster_window.py:3946
+#: ../src/roster_window.py:3986
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9367,123 +9399,115 @@
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4623 ../src/roster_window.py:4694
-#: ../src/roster_window.py:4703 ../src/systray.py:215 ../src/systray.py:262
-#: ../src/systray.py:268
+#: ../src/roster_window.py:4663 ../src/roster_window.py:4734
+#: ../src/roster_window.py:4743 ../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:4710
+#: ../src/roster_window.py:4750
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:4715
+#: ../src/roster_window.py:4755
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:4752 ../src/systray.py:278
+#: ../src/roster_window.py:4792 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Zarządzaj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4772
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4852
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4874 ../src/roster_window.py:4983
+#: ../src/roster_window.py:4914 ../src/roster_window.py:5015
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: ../src/roster_window.py:4901
+#: ../src/roster_window.py:4941
 msgid "Publish Tune"
 msgstr "_Publikuj Utwór"
 
-#: ../src/roster_window.py:4908
-msgid "Mood"
-msgstr "Nastrój"
-
-#: ../src/roster_window.py:4912
-msgid "Activity"
-msgstr "Aktywność"
-
-#: ../src/roster_window.py:4917
+#: ../src/roster_window.py:4949
 msgid "Configure Services..."
 msgstr "Konfiguruj Usługi..."
 
-#: ../src/roster_window.py:5071
+#: ../src/roster_window.py:5103
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
 #. Send Group Message
-#: ../src/roster_window.py:5079 ../src/roster_window.py:5605
+#: ../src/roster_window.py:5111 ../src/roster_window.py:5637
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: ../src/roster_window.py:5087
+#: ../src/roster_window.py:5119
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: ../src/roster_window.py:5091
+#: ../src/roster_window.py:5123
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
-#: ../src/roster_window.py:5502
+#: ../src/roster_window.py:5534
 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:5625
+#: ../src/roster_window.py:5657
 msgid "_Manage Contacts"
 msgstr "_Zarządzaj kontaktami"
 
 #. Send single message
-#: ../src/roster_window.py:5686
+#: ../src/roster_window.py:5718
 msgid "Send Single Message"
 msgstr "Wyślij wiadomość"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5742
+#: ../src/roster_window.py:5774
 msgid "_Manage Transport"
 msgstr "_Zarządzaj transportami"
 
 #. Modify Transport
-#: ../src/roster_window.py:5750
+#: ../src/roster_window.py:5782
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
-#: ../src/roster_window.py:5824
+#: ../src/roster_window.py:5856
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: ../src/roster_window.py:5831
+#: ../src/roster_window.py:5863
 msgid "_Disconnect"
 msgstr "_Rozłącz"
 
-#: ../src/roster_window.py:5911
+#: ../src/roster_window.py:5943
 msgid "_New Group Chat"
 msgstr "_Nowa rozmowa grupowa"
 
 #. History manager
-#: ../src/roster_window.py:6024
+#: ../src/roster_window.py:6056
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: ../src/roster_window.py:6033
+#: ../src/roster_window.py:6065
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: ../src/roster_window.py:6243
+#: ../src/roster_window.py:6275
 msgid "Change Status Message..."
 msgstr "Zmień opis statusu..."
 
@@ -9509,11 +9533,11 @@
 msgid "Subject: %s"
 msgstr "Temat: %s"
 
-#: ../src/session.py:403 ../src/session.py:438
+#: ../src/session.py:411 ../src/session.py:446
 msgid "Confirm these session options"
 msgstr "Potwierdź opcje sesji"
 
-#: ../src/session.py:405
+#: ../src/session.py:413
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9529,7 +9553,7 @@
 "\n"
 "\t\tCzy akceptujesz te ustawienia?"
 
-#: ../src/session.py:439
+#: ../src/session.py:447
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9544,11 +9568,11 @@
 "\n"
 "Kontynuować?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Zmień opis statusu..."
 
-#: ../src/systray.py:293
+#: ../src/systray.py:294
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
@@ -9604,14 +9628,6 @@
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Nastrój:"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Aktywność:"
-
 #: ../src/tooltips.py:638
 msgid "Tune:"
 msgstr "Utwór"
@@ -9688,9 +9704,8 @@
 msgstr "od %s"
 
 #: ../src/vcard.py:332
-#, fuzzy
 msgid "<b>Affiliation:</b>"
-msgstr "<b>Aplikacje</b>"
+msgstr "<b>Grupy:</b>"
 
 #: ../src/vcard.py:340
 msgid ""
@@ -9756,6 +9771,12 @@
 #~ msgid "Gajim account %s"
 #~ msgstr "Konto Gajim'a %s"
 
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Taki Jabber ID już istnieje!"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Konto o takiej nazwie jest już skonfigurowane."
+
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
@@ -9786,9 +9807,12 @@
 #~ msgid "libsexy"
 #~ msgstr "libsexy"
 
-#~ msgid "%s is not a valid loglevel"
-#~ msgstr "%s nie jest prawidłowym poziomem logowania"
+#~ msgid "Mood"
+#~ msgstr "Nastrój"
 
+#~ msgid "Activity"
+#~ msgstr "Aktywność"
+
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr ""
 #~ "Ani %s nie przesyła swojego klucza OpenPGP, ani Ty nie przypisałeś mu "

Modified: branches/osx_newbuildsys/po/uk.po
===================================================================
--- branches/osx_newbuildsys/po/uk.po	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/po/uk.po	2009-04-30 17:05:59 UTC (rev 11255)
@@ -3,25 +3,25 @@
 # Copyright (C) 2008 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package.
 #
-# Sergiy Yegorov <prapor at unixzone.org.ua>, 2008.
+# Sergiy Yegorov <prapor at unixzone.org.ua>, 2009.
 # Yuri Chornoivan <yurchor at ukr.net>, 2008
 #. app_name (string)
 #. replaces_id (uint)
 #. event_id (string)
 #. app_icon (string)
-#: ../src/notify.py:530
+#: ../src/notify.py:563
 msgid ""
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-01 14:53+0100\n"
-"PO-Revision-Date: 2008-12-28 13:38+0200\n"
+"POT-Creation-Date: 2009-04-08 11:18+0200\n"
+"PO-Revision-Date: 2009-04-08 11:50+0300\n"
 "Last-Translator: Sergiy Yegorov <prapor at unixzone.org.ua>\n"
-"Language-Team: Ukrainian <kde-i18n-doc at lists.kde.org>\n"
+"Language-Team: Ukrainian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 0.2\n"
 
@@ -100,6 +100,10 @@
 msgstr "<b>Будь ласка, виберіть сервер</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid "@"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -107,23 +111,23 @@
 "Додати цей сертифікат до переліку довірених сертифікатів.\n"
 "SHA1 відбиток сертифікату:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
 msgstr "З'єднатись після натискання кнопки «Завершити»"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Майстер створення облікових записів"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "I already have an account I want to _use"
 msgstr "Я вже маю обліковий запис, який бажаю _використовувати"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Я бажаю _зареєструвати новий обліковий запис"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:24
 msgid "If checked, Gajim will remember the password for this account"
@@ -131,31 +135,31 @@
 "Якщо буде позначено цей пункт, Gajim запам'ятає пароль цього облікового "
 "запису"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:26
 msgid "Manage..."
 msgstr "Керування..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 msgid "Prox_y:"
 msgstr "Прокс_і:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #: ../data/glade/account_modification_window.glade.h:40
 #: ../data/glade/accounts_window.glade.h:45
 msgid "Save pass_word"
 msgstr "Зберегти _пароль"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Set my profile when I connect"
 msgstr "Налаштувати мій профіль після з’єднання"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 #: ../data/glade/account_modification_window.glade.h:45
 msgid "Use custom hostname/port"
 msgstr "Використовувати інші вузол/порт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -163,10 +167,6 @@
 "Для з’єднання з мережею Jabber вам потрібен обліковий\n"
 "запис."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-msgid "Your JID:"
-msgstr "Ваш JID:"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:23
 #: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
@@ -181,24 +181,25 @@
 msgstr "Назва _вузла:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 #: ../data/glade/account_modification_window.glade.h:50
 #: ../data/glade/accounts_window.glade.h:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:16
-msgid "_Username:"
-msgstr "_Користувач:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -285,9 +286,9 @@
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
 #: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1140
-#: ../src/common/helpers.py:1152 ../src/notify.py:526 ../src/notify.py:544
-#: ../src/notify.py:580 ../src/notify.py:592
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1155 ../src/notify.py:559 ../src/notify.py:580
+#: ../src/notify.py:619 ../src/notify.py:631
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -297,8 +298,8 @@
 #: ../data/glade/account_modification_window.glade.h:17
 #: ../data/glade/accounts_window.glade.h:21
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2644
-#: ../src/roster_window.py:5194
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2645
+#: ../src/roster_window.py:5196
 msgid "General"
 msgstr "Загальне"
 
@@ -359,8 +360,8 @@
 msgstr "Відомості про вас, які зберігаються на сервері"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1564
-#: ../src/config.py:2067
+#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1570
+#: ../src/config.py:2073
 msgid "No key selected"
 msgstr "Не обрано жодного ключа"
 
@@ -371,12 +372,12 @@
 #. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
 #: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1115
-#: ../src/config.py:1204 ../src/config.py:1472 ../src/config.py:1477
-#: ../src/config.py:1975 ../src/config.py:2053 ../src/config.py:2066
-#: ../src/config.py:3167 ../src/config.py:3235 ../src/dialogs.py:291
-#: ../src/dialogs.py:293 ../src/dialogs.py:519 ../src/roster_window.py:2713
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2724
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1118
+#: ../src/config.py:1207 ../src/config.py:1475 ../src/config.py:1480
+#: ../src/config.py:1981 ../src/config.py:2059 ../src/config.py:2072
+#: ../src/config.py:3161 ../src/config.py:3229 ../src/dialogs.py:293
+#: ../src/dialogs.py:295 ../src/dialogs.py:523 ../src/roster_window.py:2715
+#: ../src/roster_window.py:2721 ../src/roster_window.py:2726
 msgid "None"
 msgstr "Немає"
 
@@ -473,11 +474,6 @@
 msgid "_Adjust to status"
 msgstr "_Узгодити зі станом"
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
-
 #: ../data/glade/account_modification_window.glade.h:49
 #: ../data/glade/manage_proxies_window.glade.h:14
 msgid "_Name:"
@@ -488,7 +484,6 @@
 msgstr "<b>Проксі</b>"
 
 #: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
 msgid "A_djust to status"
 msgstr "_Узгодити зі станом"
 
@@ -505,7 +500,6 @@
 "незахищеним з’єднанням."
 
 #: ../data/glade/accounts_window.glade.h:16
-#, fuzzy
 msgid "Co_nnect on Gajim startup"
 msgstr "_З'єднуватись після запуску Gajim"
 
@@ -536,7 +530,7 @@
 "Можливо, вам також доведеться змінити параметри брандмауера."
 
 #: ../data/glade/accounts_window.glade.h:31
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:675
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:680
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -550,57 +544,47 @@
 msgstr "Об’є_днати облікові записи"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5145
+#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5147
 msgid "Re_name"
 msgstr "Пере_йменувати"
 
 #: ../data/glade/accounts_window.glade.h:46
-#, fuzzy
 msgid "Send _keep-alive packets"
 msgstr "Надсилати пакети підтвердження дієздатності"
 
 #: ../data/glade/accounts_window.glade.h:48
-#, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "_Синхронізувати стан облікового запису з загальним"
 
 #: ../data/glade/accounts_window.glade.h:50
-#, fuzzy
 msgid "Use G_PG Agent"
 msgstr "Використовувати _агент GnuPG"
 
 #: ../data/glade/accounts_window.glade.h:51
-#, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Використовувати інші вузол/порт"
 
 #: ../data/glade/accounts_window.glade.h:52
-#, fuzzy
 msgid "Use cust_om port:"
 msgstr "Використовувати інший порт:"
 
 #: ../data/glade/accounts_window.glade.h:54
-#, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Редагувати особисті відомості..."
 
 #: ../data/glade/accounts_window.glade.h:55
-#, fuzzy
 msgid "_Enable"
 msgstr "Увімкнути"
 
 #: ../data/glade/accounts_window.glade.h:56
-#, fuzzy
 msgid "_Hostname: "
 msgstr "Назва _вузла:"
 
 #: ../data/glade/accounts_window.glade.h:58
-#, fuzzy
 msgid "_Manage..."
 msgstr "Керування..."
 
 #: ../data/glade/accounts_window.glade.h:60
-#, fuzzy
 msgid "_Port: "
 msgstr "_Порт:"
 
@@ -609,7 +593,6 @@
 msgstr "_Попереджати перед використанням незахищеного з’єднання"
 
 #: ../data/glade/accounts_window.glade.h:62
-#, fuzzy
 msgid "_use HTTP__PROXY environment variable"
 msgstr "використовувати змінну середовища HTTP_PROXY"
 
@@ -1071,7 +1054,7 @@
 #: ../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:5841
+#: ../src/roster_window.py:5843
 msgid "_History"
 msgstr "_Журнал"
 
@@ -1179,7 +1162,7 @@
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показувати контекстне сповіщення про завершення передавання файла"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
 msgid "_Continue"
 msgstr "_Продовжити"
 
@@ -1423,7 +1406,7 @@
 msgid "_Log conversation history"
 msgstr "_Зберігати журнал спілкування"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1697
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1702
 msgid "Join Group Chat"
 msgstr "Приєднатись до групової балачки"
 
@@ -1540,12 +1523,10 @@
 msgstr "Проксі-п_орт:"
 
 #: ../data/glade/manage_proxies_window.glade.h:11
-#, fuzzy
 msgid "Use HTTP prox_y"
 msgstr "Використовувати HTTP-проксі"
 
 #: ../data/glade/manage_proxies_window.glade.h:12
-#, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Використовувати розпізнавання на проксі"
 
@@ -1554,10 +1535,13 @@
 msgstr "_Адреса URL BOSH:"
 
 #: ../data/glade/manage_proxies_window.glade.h:15
-#, fuzzy
 msgid "_Type:"
 msgstr "Тип:"
 
+#: ../data/glade/manage_proxies_window.glade.h:16
+msgid "_Username:"
+msgstr "_Користувач:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
 msgstr "Додати цей контакт до реєстру (Ctrl+D)"
@@ -1703,7 +1687,7 @@
 
 #: ../data/glade/preferences_window.glade.h:26
 msgid "Allow sound when I'm _busy"
-msgstr ""
+msgstr "Дозволити звуки у стані _зайнятий."
 
 #: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
@@ -1958,6 +1942,9 @@
 "Only when pending events\n"
 "Always"
 msgstr ""
+"Ніколи\n"
+"Лише події, що очікують уваги\n"
+"Завжди"
 
 #: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
@@ -1998,7 +1985,6 @@
 msgstr "Параметри"
 
 #: ../data/glade/preferences_window.glade.h:84
-#, fuzzy
 msgid "Show systray:"
 msgstr "_Показати подію у системному лотку"
 
@@ -2040,7 +2026,6 @@
 msgstr "Т_ема:"
 
 #: ../data/glade/preferences_window.glade.h:93
-#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2051,7 +2036,6 @@
 "повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
 
 #: ../data/glade/preferences_window.glade.h:96
-#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message\n"
@@ -2205,7 +2189,7 @@
 msgid "Order:"
 msgstr "Порядок:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2571
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2576
 msgid "Privacy List"
 msgstr "Список конфіденційності"
 
@@ -2409,8 +2393,8 @@
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5182
-#: ../src/roster_window.py:5660 ../src/roster_window.py:5789
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5662 ../src/roster_window.py:5791
 msgid "_Remove"
 msgstr "В_илучити"
 
@@ -2432,14 +2416,14 @@
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5732
+#: ../src/roster_window.py:5734
 msgid "Execute Command..."
 msgstr "Виконати команду..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5100 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5102 ../src/roster_window.py:5615
 msgid "In_vite to"
 msgstr "За_просити до"
 
@@ -2449,7 +2433,7 @@
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5110 ../src/roster_window.py:5698
+#: ../src/roster_window.py:5112 ../src/roster_window.py:5700
 msgid "Send Cus_tom Status"
 msgstr "Надіслати не_типовий стан"
 
@@ -2475,8 +2459,8 @@
 msgstr "_Дозволити йому/їй бачити мій стан"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5173 ../src/roster_window.py:5650
-#: ../src/roster_window.py:5779
+#: ../src/roster_window.py:5175 ../src/roster_window.py:5652
+#: ../src/roster_window.py:5781
 msgid "_Block"
 msgstr "_Заблокувати"
 
@@ -2502,8 +2486,8 @@
 msgstr "_Підписка"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5167 ../src/roster_window.py:5644
-#: ../src/roster_window.py:5776
+#: ../src/roster_window.py:5169 ../src/roster_window.py:5646
+#: ../src/roster_window.py:5778
 msgid "_Unblock"
 msgstr "_Розблокувати"
 
@@ -2536,7 +2520,6 @@
 msgstr "Профіль, _аватар"
 
 #: ../data/glade/roster_window.glade.h:9
-#, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Показувати _від’єднані контакти"
 
@@ -2607,7 +2590,7 @@
 msgstr "Дод_ати контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5801
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5803
 msgid "_Information"
 msgstr "_Інформація"
 
@@ -2702,7 +2685,6 @@
 msgstr "_Заборонити"
 
 #: ../data/glade/synchronise_contacts_dialog.glade.h:1
-#, fuzzy
 msgid "Select the account with which to synchronise"
 msgstr "Оберіть обліковий запис, з яким слід виконати синхронізацію"
 
@@ -2752,7 +2734,6 @@
 msgstr "<b>Клієнт:</b>"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-#, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Область:</b>"
 
@@ -2843,13 +2824,13 @@
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5633
+#: ../src/roster_window.py:5635
 msgid "Edit _Groups"
 msgstr "Редагувати _групи"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5759
+#: ../src/roster_window.py:5761
 msgid "_Rename"
 msgstr "Пере_йменувати"
 
@@ -3075,37 +3056,48 @@
 msgid "Clear formating"
 msgstr "Зняти форматування"
 
-#: ../src/chat_control.py:1220 ../src/chat_control.py:1623
+#: ../src/chat_control.py:856
+msgid "Really send file?"
+msgstr "Справді надіслати файл?"
+
+#: ../src/chat_control.py:857
+#, 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:1248 ../src/chat_control.py:1652
 msgid "GPG encryption enabled"
 msgstr "Шифрування GPG увімкнено"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1250 ../src/chat_control.py:2125
+#: ../src/chat_control.py:1278 ../src/chat_control.py:2154
 #: ../src/common/contacts.py:113 ../src/common/helpers.py:56
-#: ../src/common/helpers.py:227 ../src/conversation_textview.py:858
-#: ../src/dialogs.py:900 ../src/dialogs.py:1648 ../src/gajim.py:999
-#: ../src/gajim.py:1731 ../src/normal_control.py:483
-#: ../src/roster_window.py:910 ../src/roster_window.py:1541
-#: ../src/roster_window.py:1543 ../src/roster_window.py:1894
-#: ../src/roster_window.py:3083 ../src/roster_window.py:3109
-#: ../src/roster_window.py:5294 ../src/roster_window.py:5479
+#: ../src/common/helpers.py:227 ../src/conversation_textview.py:862
+#: ../src/dialogs.py:905 ../src/dialogs.py:1653 ../src/gajim.py:988
+#: ../src/gajim.py:1721 ../src/normal_control.py:483
+#: ../src/roster_window.py:910 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1890
+#: ../src/roster_window.py:3085 ../src/roster_window.py:3111
+#: ../src/roster_window.py:5296 ../src/roster_window.py:5481
 msgid "Not in Roster"
 msgstr "Немає у реєстрі"
 
-#: ../src/chat_control.py:1382 ../src/tooltips.py:627
+#: ../src/chat_control.py:1411 ../src/tooltips.py:627
 msgid "Unknown Artist"
 msgstr "Невідомий виконавець"
 
-#: ../src/chat_control.py:1384 ../src/tooltips.py:632
+#: ../src/chat_control.py:1413 ../src/tooltips.py:632
 msgid "Unknown Title"
 msgstr "Невідома назва"
 
-#: ../src/chat_control.py:1386 ../src/tooltips.py:637
+#: ../src/chat_control.py:1415 ../src/tooltips.py:637
 msgid "Unknown Source"
 msgstr "Невідоме джерело"
 
-#: ../src/chat_control.py:1390 ../src/tooltips.py:639
+#: ../src/chat_control.py:1419 ../src/tooltips.py:639
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3114,7 +3106,7 @@
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "з <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1395
+#: ../src/chat_control.py:1424
 #, python-format
 msgid ""
 "%(title)s by %(artist)s\n"
@@ -3123,17 +3115,17 @@
 "%(title)s %(artist)s\n"
 "з %(source)s"
 
-#: ../src/chat_control.py:1518
+#: ../src/chat_control.py:1547
 #, 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:1603 ../src/dialogs.py:3912
+#: ../src/chat_control.py:1632 ../src/dialogs.py:3918
 msgid "No GPG key assigned"
 msgstr "Немає ключа GPG"
 
-#: ../src/chat_control.py:1604
+#: ../src/chat_control.py:1633
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3141,50 +3133,50 @@
 "З цим контактом не пов’язано жодного ключа GPG. Отже ви не зможете шифрувати "
 "повідомлення за допомогою GPG."
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1642
 msgid "GPG encryption disabled"
 msgstr "Шифрування GPG вимкнено"
 
-#: ../src/chat_control.py:1639
+#: ../src/chat_control.py:1668
 msgid "Session WILL be logged"
 msgstr "Сеанс БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1641
+#: ../src/chat_control.py:1670
 msgid "Session WILL NOT be logged"
 msgstr "Сеанс НЕ БУДЕ записано до журналу"
 
 #. encryption %s active
-#: ../src/chat_control.py:1655
+#: ../src/chat_control.py:1684
 msgid "is"
 msgstr "є"
 
-#: ../src/chat_control.py:1655
+#: ../src/chat_control.py:1684
 msgid "is NOT"
 msgstr "НЕ є"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1686
 msgid "will"
 msgstr "буде"
 
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1686
 msgid "will NOT"
 msgstr "НЕ буде"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1661
+#: ../src/chat_control.py:1690
 msgid "and authenticated"
 msgstr "і уповноваженим"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1665
+#: ../src/chat_control.py:1694
 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:1671
+#: ../src/chat_control.py:1700
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3193,26 +3185,26 @@
 "Шифрування %(type)s %(status)s активним %(authenticated)s.\n"
 "Ваш сеанс балачки %(logged)s записано до журналу."
 
-#: ../src/chat_control.py:1719
+#: ../src/chat_control.py:1748
 msgid "Command not supported for zeroconf account."
 msgstr "Ця команда не підтримується для облікового запису zeroconf."
 
-#: ../src/chat_control.py:1730 ../src/groupchat_control.py:1657
+#: ../src/chat_control.py:1759 ../src/groupchat_control.py:1643
 #, python-format
 msgid "Commands: %s"
 msgstr "Команди:·%s"
 
-#: ../src/chat_control.py:1733 ../src/groupchat_control.py:1671
+#: ../src/chat_control.py:1762 ../src/groupchat_control.py:1657
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Використання: /%s, спорожнить вміст текстового вікна."
 
-#: ../src/chat_control.py:1736 ../src/groupchat_control.py:1676
+#: ../src/chat_control.py:1765 ../src/groupchat_control.py:1662
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Використання: /%s, сховає кнопки балачки."
 
-#: ../src/chat_control.py:1739 ../src/groupchat_control.py:1692
+#: ../src/chat_control.py:1768 ../src/groupchat_control.py:1678
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3222,38 +3214,38 @@
 "поточної групової балачки. Буде використано третю особу. (наприклад, /%"
 "(command)s впав під стілець.)"
 
-#: ../src/chat_control.py:1744
+#: ../src/chat_control.py:1773
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Використання: /%s, надсилає луна-імпульс (пінг) контактові"
 
-#: ../src/chat_control.py:1747
+#: ../src/chat_control.py:1776
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Використання: /%s, надсилає повідомлення контакту"
 
-#: ../src/chat_control.py:1750 ../src/groupchat_control.py:1715
+#: ../src/chat_control.py:1779 ../src/groupchat_control.py:1701
 #, python-format
 msgid "No help info for /%s"
 msgstr "Довідки для команди /%s не знайдено"
 
-#: ../src/chat_control.py:1883
+#: ../src/chat_control.py:1912
 msgid "Session negotiation cancelled"
 msgstr "Встановлення сеансу було скасовано"
 
-#: ../src/chat_control.py:1890
+#: ../src/chat_control.py:1919
 msgid "This session is encrypted"
 msgstr "Цей сеанс зашифровано"
 
-#: ../src/chat_control.py:1893
+#: ../src/chat_control.py:1922
 msgid " and WILL be logged"
 msgstr " і БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1895
+#: ../src/chat_control.py:1924
 msgid " and WILL NOT be logged"
 msgstr " і НЕ БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1900
+#: ../src/chat_control.py:1929
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3261,25 +3253,25 @@
 "Особу віддаленого контакту не було перевірено. Натисніть кнопку з щитом, щоб "
 "ознайомитися з подробицями."
 
-#: ../src/chat_control.py:1902
+#: ../src/chat_control.py:1931
 msgid "E2E encryption disabled"
 msgstr "Шифрування E2E вимкнено"
 
-#: ../src/chat_control.py:1936 ../src/chat_control.py:1949
+#: ../src/chat_control.py:1965 ../src/chat_control.py:1978
 msgid "The following message was NOT encrypted"
 msgstr "Наступне повідомлення НЕ було зашифровано"
 
-#: ../src/chat_control.py:1942
+#: ../src/chat_control.py:1971
 msgid "The following message was encrypted"
 msgstr "Наступне повідомлення було зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2313
+#: ../src/chat_control.py:2342
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Ви щойно отримали нове повідомлення від «%s»"
 
-#: ../src/chat_control.py:2314
+#: ../src/chat_control.py:2343
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3287,15 +3279,15 @@
 "Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде "
 "втрачено."
 
-#: ../src/chat_control.py:2462 ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2007
-#: ../src/common/connection_handlers.py:2195
-#: ../src/common/connection_handlers.py:2328 ../src/common/connection.py:1344
-#: ../src/gajim.py:177
+#: ../src/chat_control.py:2491 ../src/common/connection_handlers.py:1964
+#: ../src/common/connection_handlers.py:2010
+#: ../src/common/connection_handlers.py:2198
+#: ../src/common/connection_handlers.py:2331 ../src/common/connection.py:1344
+#: ../src/gajim.py:158
 msgid "Database Error"
 msgstr "Помилка бази даних"
 
-#: ../src/chat_control.py:2463
+#: ../src/chat_control.py:2492
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3304,7 +3296,7 @@
 "Не вдалося прочитати файл бази даних (%s). Спробуйте виправити або вилучити "
 "його (всі записи журналу буде втрачено)."
 
-#: ../src/chat_control.py:2699
+#: ../src/chat_control.py:2723
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s тепер %(status)s"
@@ -3394,8 +3386,8 @@
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
 #: ../src/common/helpers.py:56 ../src/roster_window.py:784
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
-#: ../src/roster_window.py:5070
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5072
 msgid "Groupchats"
 msgstr "Групові балачки"
 
@@ -3413,7 +3405,7 @@
 
 #: ../src/common/config.py:82
 msgid "Play sound when user is busy"
-msgstr ""
+msgstr "Програвати звук, коли користувач зайнятий"
 
 #: ../src/common/config.py:83
 msgid "Use D-Bus and Notification-Daemon to show notifications"
@@ -3421,7 +3413,7 @@
 
 #: ../src/common/config.py:85
 msgid "Show only online and free for chat contacts in roster."
-msgstr ""
+msgstr "Показувати лише користувачів в мережі або бажаючих спілкуватись"
 
 #: ../src/common/config.py:88
 msgid "Time in minutes, after which your status changes to away."
@@ -3456,6 +3448,8 @@
 #: ../src/common/config.py:102
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
+"Коли показувати піктограму у лотку. Можливі варіанти ніколи (never), при "
+"події (on_event) та завжди (always)."
 
 #: ../src/common/config.py:112
 msgid ""
@@ -3465,9 +3459,9 @@
 "згорнуто."
 
 #. sorted alphanum
-#: ../src/common/config.py:113 ../src/common/config.py:464
+#: ../src/common/config.py:113 ../src/common/config.py:465
 #: ../src/common/optparser.py:221 ../src/common/optparser.py:439
-#: ../src/common/optparser.py:473 ../src/gajim.py:3263
+#: ../src/common/optparser.py:473 ../src/gajim.py:3269
 msgid "default"
 msgstr "типовий"
 
@@ -4007,7 +4001,6 @@
 "значення відповідають більшим символам формул."
 
 #: ../src/common/config.py:271
-#, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4015,15 +4008,21 @@
 "Чинні схеми uri. «Справжніми» uri вважатимуться лише схеми вказані у списку. "
 "(mailto і xmpp обробляються окремо)"
 
-#: ../src/common/config.py:282
+#: ../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:283
+msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 "Пріоритет автоматично змінюватиметься залежно від вашого стану. Пріоритети "
 "визначаються за допомогою параметрів autopriority_*."
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:291
 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 +4031,26 @@
 "значення: online, chat, away, xa, dnd, invisible. ЗАУВАЖЕННЯ: цей параметр "
 "використовуватиметься, лише якщо вимкнено параметр restore_last_status"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:292
 msgid "If enabled, restore the last status that was used."
 msgstr "Якщо увімкнено, відновлювати попередній використаний стан."
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:297
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Якщо вимкнено, не підписувати повідомлення про присутність ключем GPG, "
 "навіть якщо GPG налаштовано для використання."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:299
 msgid "Enable ESessions encryption for this account."
 msgstr "Увімкнути шифрування ESession для цього облікового запису."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:300
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Чи має Gajim автоматично починати сеанс з шифруванням за можливості?"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:301
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4059,24 +4058,24 @@
 "Впорядкований список відокремлених комами типів з’єднання, які має "
 "спробувати програма. Можливі значення: tls, ssl і plain"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:302
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати пароль "
 "нешифрованим з’єднанням."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:303
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж користуватися стандартною "
 "бібліотекою SSL."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:305
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Відокремлений пробілами список помилок ssl, які слід ігнорувати."
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:317
 msgid ""
 "How many seconds to wait for the answer of keepalive packet before we try to "
 "reconnect."
@@ -4086,11 +4085,11 @@
 "з’єднання."
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:321
 msgid "Jabberd2 workaround"
 msgstr "Обхідний прийом для Jabberd2"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:325
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4099,15 +4098,15 @@
 "проксі сервери, визначення параметром file_transfer_proxies, для передавання "
 "файлів."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:339
 msgid "Answer to receipt requests"
 msgstr "Відповідати на запити щодо підтвердження отримання"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:340
 msgid "Sent receipt requests"
 msgstr "Надіслані запити на підтвердження отримання"
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:348
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4115,11 +4114,11 @@
 "Під час налаштування сеансу з шифруванням, чи слід Gajim припускати, що ви "
 "бажаєте вести запис повідомлень?"
 
-#: ../src/common/config.py:405
+#: ../src/common/config.py:406
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Чи увімкнено OpenPGP для цього контакту?"
 
-#: ../src/common/config.py:406
+#: ../src/common/config.py:407
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4127,101 +4126,101 @@
 "Чи має Gajim за можливості автоматично запускати шифрований сеанс "
 "спілкування з цим контактом?"
 
-#: ../src/common/config.py:407 ../src/common/config.py:410
+#: ../src/common/config.py:408 ../src/common/config.py:411
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова, згідно правил якої відбуватиметься перевірка правопису слів"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:417
 msgid "all or space separated status"
 msgstr "all або відокремлені пробілами стани"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:418
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' або 'both'"
 
-#: ../src/common/config.py:418 ../src/common/config.py:420
-#: ../src/common/config.py:421 ../src/common/config.py:424
-#: ../src/common/config.py:425
+#: ../src/common/config.py:419 ../src/common/config.py:421
+#: ../src/common/config.py:422 ../src/common/config.py:425
+#: ../src/common/config.py:426
 msgid "'yes', 'no' or ''"
 msgstr "'так', 'ні' або ''"
 
-#: ../src/common/config.py:431 ../src/common/pep.py:159
+#: ../src/common/config.py:432 ../src/common/pep.py:159
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:433
 msgid "Back soon"
 msgstr "Скоро повернуся"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:433
 msgid "Back in some minutes."
 msgstr "Повернуся за декілька хвилин."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:129
+#: ../src/common/config.py:434 ../src/common/pep.py:129
 msgid "Eating"
 msgstr "Їм"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "I'm eating, so leave me a message."
 msgstr "Зараз їм, залиште повідомлення, перегляну пізніше."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "Movie"
 msgstr "Відео"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "I'm watching a movie."
 msgstr "Я дивлюся відео."
 
-#: ../src/common/config.py:435 ../src/common/pep.py:188
+#: ../src/common/config.py:436 ../src/common/pep.py:188
 msgid "Working"
 msgstr "Працюю"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:436
 msgid "I'm working."
 msgstr "Я працюю."
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:437
 msgid "I'm on the phone."
 msgstr "Я розмовляю телефоном."
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:438
 msgid "Out"
 msgstr "Відійшов(шла)"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:438
 msgid "I'm out enjoying life."
 msgstr "Я насолоджуюся життям."
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:442
 msgid "I'm available."
 msgstr "Я — доступний (доступна) для балачки."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:443
 msgid "I'm free for chat."
 msgstr "Я — вільний (вільна) для балачки."
 
-#: ../src/common/config.py:443 ../src/config.py:1404
+#: ../src/common/config.py:444 ../src/config.py:1407
 msgid "Be right back."
 msgstr "Скоро повернуся."
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:445
 msgid "I'm not available."
 msgstr "Я — недоступний (недоступна) для балачки."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:446
 msgid "Do not disturb."
 msgstr "Не турбувати."
 
-#: ../src/common/config.py:446 ../src/common/config.py:447
+#: ../src/common/config.py:447 ../src/common/config.py:448
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:458
 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."
@@ -4230,23 +4229,23 @@
 "зі слів, вказаних за допомогою параметра muc_highlight_words, або якщо "
 "повідомлення групової балачки містить ваш псевдонім."
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:459
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: ../src/common/config.py:467 ../src/common/optparser.py:235
+#: ../src/common/config.py:468 ../src/common/optparser.py:235
 msgid "green"
 msgstr "зелений"
 
-#: ../src/common/config.py:471 ../src/common/optparser.py:221
+#: ../src/common/config.py:472 ../src/common/optparser.py:221
 msgid "grocery"
 msgstr "овочевий"
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:476
 msgid "human"
 msgstr "тілесний"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:480
 msgid "marine"
 msgstr "морський"
 
@@ -4272,17 +4271,15 @@
 "проміжку часу"
 
 #: ../src/common/connection_handlers.py:677
-#, fuzzy
 msgid "Registration succeeded"
 msgstr "Зареєструватися на %s"
 
 #: ../src/common/connection_handlers.py:678
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr ""
+msgstr "Реєстрацію з агентом %s вдало закінчено"
 
 #: ../src/common/connection_handlers.py:680
-#, fuzzy
 msgid "Registration failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
@@ -4291,13 +4288,14 @@
 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:968
-#: ../src/common/connection_handlers.py:1959
-#: ../src/common/connection_handlers.py:2005
-#: ../src/common/connection_handlers.py:2193
-#: ../src/common/connection_handlers.py:2326 ../src/common/connection.py:1342
-#: ../src/gajim.py:400
+#: ../src/common/connection_handlers.py:1962
+#: ../src/common/connection_handlers.py:2008
+#: ../src/common/connection_handlers.py:2196
+#: ../src/common/connection_handlers.py:2329 ../src/common/connection.py:1342
+#: ../src/gajim.py:378
 msgid "Disk Write Error"
 msgstr "Помилка під час спроби запису на диск"
 
@@ -4310,23 +4308,23 @@
 msgid "Account %s doesn't support invisibility."
 msgstr "Обліковий запис %s не підтримує невидимості."
 
-#: ../src/common/connection_handlers.py:1787 ../src/common/connection.py:1157
-#: ../src/config.py:1829 ../src/config.py:1837 ../src/config.py:1880
-#: ../src/config.py:3105 ../src/dataforms_widget.py:603 ../src/dialogs.py:2357
+#: ../src/common/connection_handlers.py:1790 ../src/common/connection.py:1157
+#: ../src/config.py:1835 ../src/config.py:1843 ../src/config.py:1886
+#: ../src/config.py:3111 ../src/dataforms_widget.py:603 ../src/dialogs.py:2362
 msgid "Invalid Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber"
 
-#: ../src/common/connection_handlers.py:1788
+#: ../src/common/connection_handlers.py:1791
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 "Надійшло повідомлення від некоректного JID, це повідомлення було "
 "проігноровано."
 
-#: ../src/common/connection_handlers.py:1962
-#: ../src/common/connection_handlers.py:2008
-#: ../src/common/connection_handlers.py:2196
-#: ../src/common/connection_handlers.py:2329 ../src/common/connection.py:1345
-#: ../src/gajim.py:178
+#: ../src/common/connection_handlers.py:1965
+#: ../src/common/connection_handlers.py:2011
+#: ../src/common/connection_handlers.py:2199
+#: ../src/common/connection_handlers.py:2332 ../src/common/connection.py:1345
+#: ../src/gajim.py:159
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4336,7 +4334,7 @@
 "http://trac.gajim.org/wiki/DatabaseBackup) або вилучити його (всі журнали "
 "буде втрачено)."
 
-#: ../src/common/connection_handlers.py:2080
+#: ../src/common/connection_handlers.py:2083
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Заборонений псевдонім: %s"
@@ -4344,72 +4342,72 @@
 #. we are banned
 #. group chat does not exist
 #. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2155
 #: ../src/common/connection_handlers.py:2158
 #: ../src/common/connection_handlers.py:2161
 #: ../src/common/connection_handlers.py:2164
-#: ../src/common/connection_handlers.py:2168 ../src/gajim.py:548
+#: ../src/common/connection_handlers.py:2167
+#: ../src/common/connection_handlers.py:2171 ../src/gajim.py:531
 msgid "Unable to join group chat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2159
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вас заблокували у груповій балачці %s."
 
-#: ../src/common/connection_handlers.py:2159
+#: ../src/common/connection_handlers.py:2162
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Групової балачки %s не існує."
 
-#: ../src/common/connection_handlers.py:2162
+#: ../src/common/connection_handlers.py:2165
 msgid "Group chat creation is restricted."
 msgstr "Можливість створення групових балачок обмежено."
 
-#: ../src/common/connection_handlers.py:2165
+#: ../src/common/connection_handlers.py:2168
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr ""
 "Для групової балачки %s слід використовувати псевдонім, під яким ви "
 "зареєструвалися."
 
-#: ../src/common/connection_handlers.py:2169
+#: ../src/common/connection_handlers.py:2172
 #, 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:2211
+#: ../src/common/connection_handlers.py:2214
 msgid "Room has been destroyed"
 msgstr "Кімнату було знищено"
 
-#: ../src/common/connection_handlers.py:2218
+#: ../src/common/connection_handlers.py:2221
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Ви можете приєднатися до цієї кімнати замість %s"
 
-#: ../src/common/connection_handlers.py:2245
+#: ../src/common/connection_handlers.py:2248
 msgid "I would like to add you to my roster."
 msgstr "Я хочу додати вас до свого реєстру."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2266
+#: ../src/common/connection_handlers.py:2269
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "тепер ми підписані на %s"
 
-#: ../src/common/connection_handlers.py:2268
+#: ../src/common/connection_handlers.py:2271
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запит на скасування підписки від %s"
 
-#: ../src/common/connection_handlers.py:2270
+#: ../src/common/connection_handlers.py:2273
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "підписку на %s скасовано"
 
-#: ../src/common/connection_handlers.py:2453
+#: ../src/common/connection_handlers.py:2456
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4420,15 +4418,15 @@
 "jabberstudio.org/ для його вилучення"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2478
-#: ../src/common/zeroconf/connection_zeroconf.py:173
+#: ../src/common/connection_handlers.py:2481
+#: ../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:2480
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1935
+#: ../src/common/connection_handlers.py:2483
+#: ../src/common/zeroconf/connection_zeroconf.py:177
+#: ../src/roster_window.py:1931
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "З’єднання з %s буде встановлено без OpenPGP."
@@ -4562,7 +4560,7 @@
 msgstr "Помилка під час перевірки програми"
 
 #: ../src/common/connection.py:271
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "З’єднання з обліковим записом «%s» було втрачено"
@@ -4602,17 +4600,17 @@
 
 #: ../src/common/connection.py:629 ../src/common/connection.py:755
 #: ../src/common/connection.py:1478
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:251
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не вдалося з’єднатися з «%s»"
 
-#: ../src/common/connection.py:630 ../src/gajim.py:1094
+#: ../src/common/connection.py:630 ../src/gajim.py:1083
 msgid "Check your connection or try again later."
 msgstr "Перевірте ваше з’єднання, а потім повторіть спробу."
 
 #: ../src/common/connection.py:635
-#, fuzzy, python-format
+#, python-format
 msgid "Server replied: %s"
 msgstr "Збережено за адресою: %s"
 
@@ -4681,18 +4679,18 @@
 "у одному з ресурсів, з яким з’єднано ваш клієнт. Вимкніть цей ресурс і "
 "повторіть спробу."
 
-#: ../src/common/connection.py:1158 ../src/dialogs.py:2358
+#: ../src/common/connection.py:1158 ../src/dialogs.py:2363
 #, 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:1180
-#: ../src/common/zeroconf/connection_zeroconf.py:389
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Не підписано повідомлення про присутність, ключа також не призначено."
 
 #: ../src/common/connection.py:1182
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:393
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4705,7 +4703,7 @@
 msgstr "[Це повідомлення *зашифровано* (див. :XEP:`27`]"
 
 #: ../src/common/connection.py:1332
-#: ../src/common/zeroconf/connection_zeroconf.py:468
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4719,15 +4717,15 @@
 msgstr "Не отримано через стан невидимості"
 
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:56
-#: ../src/gajim.py:999
+#: ../src/gajim.py:988
 msgid "Observers"
 msgstr "Спостерігачі"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:56 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1350 ../src/gajim.py:812 ../src/roster_window.py:814
-#: ../src/roster_window.py:1468 ../src/roster_window.py:1537
-#: ../src/roster_window.py:1539 ../src/roster_window.py:1688
+#: ../src/disco.py:1350 ../src/gajim.py:801 ../src/roster_window.py:814
+#: ../src/roster_window.py:1469 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1684
 msgid "Transports"
 msgstr "Транспорти"
 
@@ -5121,7 +5119,7 @@
 msgid "%s B"
 msgstr "%s Б"
 
-#: ../src/common/helpers.py:1089 ../src/common/helpers.py:1096
+#: ../src/common/helpers.py:1092 ../src/common/helpers.py:1099
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5129,22 +5127,22 @@
 msgstr[1] "у черзі %d повідомлення"
 msgstr[2] "у черзі %d повідомлень"
 
-#: ../src/common/helpers.py:1102
+#: ../src/common/helpers.py:1105
 #, python-format
 msgid " from room %s"
 msgstr " з кімнати %s"
 
-#: ../src/common/helpers.py:1105 ../src/common/helpers.py:1124
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1127
 #, python-format
 msgid " from user %s"
 msgstr " від користувача %s"
 
-#: ../src/common/helpers.py:1107
+#: ../src/common/helpers.py:1110
 #, python-format
 msgid " from %s"
 msgstr " від %s"
 
-#: ../src/common/helpers.py:1114 ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1117 ../src/common/helpers.py:1124
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5152,7 +5150,7 @@
 msgstr[1] "у черзі %d події"
 msgstr[2] "у черзі %d подій"
 
-#: ../src/common/helpers.py:1154
+#: ../src/common/helpers.py:1157
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5177,9 +5175,9 @@
 msgstr "перехід від бази даних журналів до покажчика"
 
 #: ../src/common/passwords.py:117
-#, fuzzy, python-format
+#, python-format
 msgid "XMPP account %s@%s"
-msgstr "облікового запису %s"
+msgstr "облікового запису %s@%s"
 
 #: ../src/common/pep.py:29
 msgid "Afraid"
@@ -5840,17 +5838,17 @@
 "Вузол %s, який було налаштовано вами за допомогою параметра "
 "ft_add_hosts_to_send advanced записано некоректно, його буде проігноровано."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Щоб продовжити надсилання і отримання повідомлень, вам потрібно повторити "
 "процедуру з’єднання."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Помилка Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5859,31 +5857,31 @@
 "%s\n"
 "Обмін локальними повідомленнями може працювати з помилками."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Будь ласка, переконайтеся, що встановлено Avahi або Bonjour."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Не вдалося запустити локальну службу"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не вдалося прив’язатися до порту %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Будь ласка, переконайтеся, що запущено фонову службу avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не вдалося змінити стан облікового запису «%s»"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5892,21 +5890,21 @@
 "у стані невидимості. Ваше повідомлення не може бути надіслано."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Це повідомлення зашифровано]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Ваше повідомлення неможливо надіслати."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 "Контакт перебуває поза мережею. Ваше повідомлення не може бути надіслано."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:586
+#: ../src/common/zeroconf/connection_zeroconf.py:588
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -5919,7 +5917,7 @@
 msgid "Error while adding service. %s"
 msgstr "Помилка під час додавання служби. %s"
 
-#: ../src/config.py:151 ../src/config.py:602
+#: ../src/config.py:151 ../src/config.py:605
 msgid "Disabled"
 msgstr "Вимкнено"
 
@@ -5939,12 +5937,12 @@
 msgid "Custom"
 msgstr "Нетиповий"
 
-#: ../src/config.py:668 ../src/dialogs.py:1196
+#: ../src/config.py:671 ../src/dialogs.py:1201
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Словники для мови %s не доступні"
 
-#: ../src/config.py:669
+#: ../src/config.py:672
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5953,76 +5951,76 @@
 "Ви маєте встановити словники %s для використання перевірки орфографії, або "
 "обрати іншу мову через параметр speller_language."
 
-#: ../src/config.py:1046
+#: ../src/config.py:1049
 msgid "status message title"
 msgstr "заголовок повідомлення про стан"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1049
 msgid "status message text"
 msgstr "текст повідомлення про стан"
 
 #. Name column
-#: ../src/config.py:1326 ../src/dialogs.py:1823 ../src/dialogs.py:1887
+#: ../src/config.py:1329 ../src/dialogs.py:1828 ../src/dialogs.py:1892
 #: ../src/disco.py:771 ../src/disco.py:1563 ../src/disco.py:1809
 #: ../src/history_window.py:87
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/config.py:1412
+#: ../src/config.py:1415
 msgid "Relogin now?"
 msgstr "Повторно увійти зараз?"
 
-#: ../src/config.py:1413
+#: ../src/config.py:1416
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Якщо ви бажаєте, щоб всі зміни негайно набули чинності, вам слід вийти з "
 "облікового запису, а потім знову туди увійти."
 
-#: ../src/config.py:1538 ../src/config.py:1639
+#: ../src/config.py:1544 ../src/config.py:1645
 msgid "OpenPGP is not usable on this computer"
 msgstr "На цьому комп'ютері OpenPGP не придатне для використання"
 
-#: ../src/config.py:1675 ../src/config.py:1718
+#: ../src/config.py:1681 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Непрочитані події"
 
-#: ../src/config.py:1676
+#: ../src/config.py:1682
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Перш ніж вилучати цей обліковий запис, прочитайте усі повідомлення з черги "
 "подій."
 
-#: ../src/config.py:1702
+#: ../src/config.py:1708
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Ви розпочали балачку за допомогою облікового запису %s"
 
-#: ../src/config.py:1703
+#: ../src/config.py:1709
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити "
 "процедуру виходу?"
 
-#: ../src/config.py:1714
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Зараз ваш клієнт з’єднано з сервером"
 
-#: ../src/config.py:1715
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 "Для зміни назви облікового запису вам слід від’єднати клієнт від сервера."
 
-#: ../src/config.py:1719
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для зміни назви облікового запису вам слід прочитати усі повідомлення з "
 "черги подій."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Така назва облікового запису вже використовується"
 
-#: ../src/config.py:1726
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6030,143 +6028,143 @@
 "Ви вже створили обліковий запис з такою назвою. Будь ласка, оберіть іншу "
 "назву."
 
-#: ../src/config.py:1730 ../src/config.py:1734
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Некоректна назва облікового запису"
 
-#: ../src/config.py:1731
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Назва облікового запису не може бути порожньою."
 
-#: ../src/config.py:1735
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Назва облікового запису не може містити пробіли."
 
-#: ../src/config.py:1810
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Перейменувати запис"
 
-#: ../src/config.py:1811
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введіть нову назву для облікового запису %s"
 
-#: ../src/config.py:1838
+#: ../src/config.py:1844
 msgid "A Jabber ID must be in the form \"user at servername\"."
 msgstr "Ідентифікатор Jabber слід вказувати як «користувач@назва.сервера»."
 
-#: ../src/config.py:2028 ../src/config.py:3177
+#: ../src/config.py:2034 ../src/config.py:3171
 msgid "Invalid entry"
 msgstr "Некоректний запис"
 
-#: ../src/config.py:2029 ../src/config.py:3178
+#: ../src/config.py:2035 ../src/config.py:3172
 msgid "Custom port must be a port number."
 msgstr "Нетиповий порти слід вказувати у вигляді номера."
 
-#: ../src/config.py:2050
+#: ../src/config.py:2056
 msgid "Failed to get secret keys"
 msgstr "Спроба отримання закритих ключів завершилася невдало"
 
-#: ../src/config.py:2051
+#: ../src/config.py:2057
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Виникла проблема з отриманням ваших закритих ключів OpenPGP."
 
-#: ../src/config.py:2086
+#: ../src/config.py:2092
 msgid "OpenPGP Key Selection"
 msgstr "Вибір ключа OpenPGP"
 
-#: ../src/config.py:2087
+#: ../src/config.py:2093
 msgid "Choose your OpenPGP key"
 msgstr "Оберіть свій ключ OpenPGP"
 
-#: ../src/config.py:2094
+#: ../src/config.py:2100
 msgid "No such account available"
 msgstr "Вказаний обліковий запис недоступний"
 
-#: ../src/config.py:2095
+#: ../src/config.py:2101
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Вам слід створити обліковий запис, перш ніж розпочати редагування ваших "
 "особистих відомостей."
 
-#: ../src/config.py:2102 ../src/dialogs.py:1675 ../src/dialogs.py:1811
-#: ../src/dialogs.py:1990 ../src/disco.py:439 ../src/profile_window.py:317
+#: ../src/config.py:2108 ../src/dialogs.py:1680 ../src/dialogs.py:1816
+#: ../src/dialogs.py:1995 ../src/disco.py:439 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2109
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без з’єднання ви не зможете редагувати ваші особисті відомості."
 
-#: ../src/config.py:2107
+#: ../src/config.py:2113
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не підтримує Vcard"
 
-#: ../src/config.py:2108
+#: ../src/config.py:2114
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може зберігати ваші особисті відомості."
 
-#: ../src/config.py:2139
+#: ../src/config.py:2145
 msgid "Account Local already exists."
 msgstr "Обліковий запис Local вже існує."
 
-#: ../src/config.py:2140
+#: ../src/config.py:2146
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Будь ласка, перейменуйте або вилучіть його, перш ніж вмикати локальні "
 "повідомлення."
 
-#: ../src/config.py:2323
+#: ../src/config.py:2329
 #, python-format
 msgid "Edit %s"
 msgstr "Редагувати %s"
 
-#: ../src/config.py:2325
+#: ../src/config.py:2331
 #, python-format
 msgid "Register to %s"
 msgstr "Зареєструватися на %s"
 
 #. list at the beginning
-#: ../src/config.py:2361
+#: ../src/config.py:2367
 msgid "Ban List"
 msgstr "Список заборон"
 
-#: ../src/config.py:2362
+#: ../src/config.py:2368
 msgid "Member List"
 msgstr "Список учасників"
 
-#: ../src/config.py:2363
+#: ../src/config.py:2369
 msgid "Owner List"
 msgstr "Список власників"
 
-#: ../src/config.py:2364
+#: ../src/config.py:2370
 msgid "Administrator List"
 msgstr "Список адміністраторів"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2413 ../src/disco.py:778 ../src/history_manager.py:183
+#: ../src/config.py:2419 ../src/disco.py:778 ../src/history_manager.py:183
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2423
+#: ../src/config.py:2429
 msgid "Reason"
 msgstr "Підстава"
 
-#: ../src/config.py:2430
+#: ../src/config.py:2436
 msgid "Nick"
 msgstr "Прізвисько"
 
-#: ../src/config.py:2436
+#: ../src/config.py:2442
 msgid "Role"
 msgstr "Роль"
 
-#: ../src/config.py:2463
+#: ../src/config.py:2469
 msgid "Banning..."
 msgstr "Блокування..."
 
 #. You can move '\n' before user at domain if that line is TOO BIG
-#: ../src/config.py:2465
+#: ../src/config.py:2471
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6174,11 +6172,11 @@
 "<b>Кого ви бажаєте заблокувати?</b>\n"
 "\n"
 
-#: ../src/config.py:2467
+#: ../src/config.py:2473
 msgid "Adding Member..."
 msgstr "Додавання учасника..."
 
-#: ../src/config.py:2468
+#: ../src/config.py:2474
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6186,11 +6184,11 @@
 "<b>Кому ви бажаєте надати можливість участі?</b>\n"
 "\n"
 
-#: ../src/config.py:2470
+#: ../src/config.py:2476
 msgid "Adding Owner..."
 msgstr "Додавання власника..."
 
-#: ../src/config.py:2471
+#: ../src/config.py:2477
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6198,11 +6196,11 @@
 "<b>Кого ви бажаєте зробити власником?</b>\n"
 "\n"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2479
 msgid "Adding Administrator..."
 msgstr "Додавання адміністратора..."
 
-#: ../src/config.py:2474
+#: ../src/config.py:2480
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6210,8 +6208,7 @@
 "<b>Кого ви бажаєте зробити адміністратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2475
-#, fuzzy
+#: ../src/config.py:2481
 msgid ""
 "Can be one of the following:\n"
 "1. user at domain/resource (only that resource matches).\n"
@@ -6227,85 +6224,77 @@
 "4. домен (пошук лише домену: записів користувач@домен,\n"
 "домен/ресурс або адреси, що містить піддомен)."
 
-#: ../src/config.py:2572
+#: ../src/config.py:2578
 #, python-format
 msgid "Removing %s account"
 msgstr "Вилучення облікового запису %s"
 
-#: ../src/config.py:2594 ../src/gajim.py:1482 ../src/gajim.py:1569
+#: ../src/config.py:2600 ../src/gajim.py:1472 ../src/gajim.py:1559
 msgid "Password Required"
 msgstr "Слід ввести пароль"
 
 #. ('PASSWORD_REQUIRED', account, None)
-#: ../src/config.py:2595 ../src/gajim.py:1552
+#: ../src/config.py:2601 ../src/gajim.py:1542
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введіть ваш пароль для облікового запису %s"
 
-#: ../src/config.py:2596 ../src/gajim.py:1569
+#: ../src/config.py:2602 ../src/gajim.py:1559
 msgid "Save password"
 msgstr "Зберегти пароль"
 
-#: ../src/config.py:2605
+#: ../src/config.py:2611
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: ../src/config.py:2606
+#: ../src/config.py:2612
 msgid "If you remove it, the connection will be lost."
 msgstr "Якщо ви вилучите його, з’єднання буде розірвано."
 
-#: ../src/config.py:2702
+#: ../src/config.py:2708
 msgid "Default"
 msgstr "Типовий"
 
-#: ../src/config.py:2702
+#: ../src/config.py:2708
 msgid "?print_status:All"
 msgstr "Всі"
 
-#: ../src/config.py:2703
+#: ../src/config.py:2709
 msgid "Enter and leave only"
 msgstr "Лише вхід і вихід"
 
-#: ../src/config.py:2704
+#: ../src/config.py:2710
 msgid "?print_status:None"
 msgstr "Жодного"
 
-#: ../src/config.py:2772
+#: ../src/config.py:2778
 msgid "New Group Chat"
 msgstr "Створити групову балачку"
 
-#: ../src/config.py:2805
+#: ../src/config.py:2811
 msgid "This bookmark has invalid data"
 msgstr "У цій закладці містяться некоректні дані"
 
-#: ../src/config.py:2806
+#: ../src/config.py:2812
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Будь ласка, заповніть поля сервера і кімнати або вилучіть цю закладку."
 
-#: ../src/config.py:3088
+#: ../src/config.py:3094
 msgid "Invalid username"
 msgstr "Некоректне ім’я користувача"
 
-#: ../src/config.py:3090
+#: ../src/config.py:3096
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Щоб налаштувати цей обліковий запис, вам слід вказати ім’я користувача."
 
-#: ../src/config.py:3116
-msgid "Duplicate Jabber ID"
-msgstr "Повторне використання Jabber ID"
-
-#: ../src/config.py:3117
-msgid "This account is already configured in Gajim."
-msgstr "Такий обліковий запис вже було налаштовано у Gajim."
-
-#: ../src/config.py:3134
+#: ../src/config.py:3128
 msgid "Account has been added successfully"
 msgstr "Обліковий запис було успішно додано"
 
-#: ../src/config.py:3135 ../src/config.py:3326
+#: ../src/config.py:3129 ../src/config.py:3320
 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 "
@@ -6315,26 +6304,26 @@
 "«Додатково». Пізніше ви можете виконати ті самі дії з налаштування вибором "
 "пункту «Облікові записи» у меню «Правка» головного вікна програми."
 
-#: ../src/config.py:3153
+#: ../src/config.py:3147
 msgid "Invalid server"
 msgstr "Некоректний сервер"
 
-#: ../src/config.py:3154
+#: ../src/config.py:3148
 msgid "Please provide a server on which you want to register."
 msgstr ""
 "Будь ласка, вкажіть назву сервера, на якому ви бажаєте зареєструватися."
 
-#: ../src/config.py:3205 ../src/gajim.py:2102
+#: ../src/config.py:3199 ../src/gajim.py:2101
 msgid "Certificate Already in File"
 msgstr "Сертифікат вже наявний у файлі"
 
-#: ../src/config.py:3206 ../src/gajim.py:2103
+#: ../src/config.py:3200 ../src/gajim.py:2102
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Цей сертифікат вже існує у файлі %s, програма не буде додавати його ще раз."
 
-#: ../src/config.py:3274
+#: ../src/config.py:3268
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6349,7 +6338,7 @@
 "Помилка SSL: %(error)s\n"
 "Ви все ще бажаєте з’єднатися з цим сервером?"
 
-#: ../src/config.py:3280 ../src/gajim.py:2127
+#: ../src/config.py:3274 ../src/gajim.py:2126
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6360,63 +6349,63 @@
 "Відбиток SHA1 сертифіката:\n"
 "%s"
 
-#: ../src/config.py:3305 ../src/config.py:3346
+#: ../src/config.py:3299 ../src/config.py:3340
 msgid "An error occurred during account creation"
 msgstr "Під час спроби створення облікового запису сталася помилка"
 
-#: ../src/config.py:3325
+#: ../src/config.py:3319
 msgid "Your new account has been created successfully"
 msgstr "Ваш новий обліковий запис було успішно створено"
 
-#: ../src/config.py:3430
+#: ../src/config.py:3406
 msgid "Account name is in use"
 msgstr "Цю назву облікового запису вже використано"
 
-#: ../src/config.py:3431
+#: ../src/config.py:3407
 msgid "You already have an account using this name."
 msgstr "У вас вже є обліковий запис з такою назвою."
 
-#: ../src/config.py:3584
+#: ../src/config.py:3560
 msgid "Active"
 msgstr "Активний"
 
-#: ../src/config.py:3592
+#: ../src/config.py:3568
 msgid "Event"
 msgstr "Подія"
 
-#: ../src/config.py:3627
+#: ../src/config.py:3603
 msgid "First Message Received"
 msgstr "Перше отримане повідомлення"
 
-#: ../src/config.py:3628
+#: ../src/config.py:3604
 msgid "Next Message Received Focused"
 msgstr "Фокус на наступне отримане повідомлення"
 
-#: ../src/config.py:3630
+#: ../src/config.py:3606
 msgid "Next Message Received Unfocused"
 msgstr "Зняття фокусу з наступного отриманого повідомлення"
 
-#: ../src/config.py:3631
+#: ../src/config.py:3607
 msgid "Contact Connected"
 msgstr "Контакт з'єднано"
 
-#: ../src/config.py:3632
+#: ../src/config.py:3608
 msgid "Contact Disconnected"
 msgstr "Контакт від'єднано"
 
-#: ../src/config.py:3633
+#: ../src/config.py:3609
 msgid "Message Sent"
 msgstr "Повідомлення надіслано"
 
-#: ../src/config.py:3634
+#: ../src/config.py:3610
 msgid "Group Chat Message Highlight"
 msgstr "Виділення повідомлення групової балачки"
 
-#: ../src/config.py:3635
+#: ../src/config.py:3611
 msgid "Group Chat Message Received"
 msgstr "Отримано повідомлення групової балачки"
 
-#: ../src/config.py:3636
+#: ../src/config.py:3612
 msgid "GMail Email Received"
 msgstr "Отримано електронного листа GMail "
 
@@ -6438,51 +6427,51 @@
 "Текст під цим рядком відповідає повідомленням, які було\n"
 "надіслано з часу, коли ви востаннє зазирали до цього вікна групової балачки"
 
-#: ../src/conversation_textview.py:689
+#: ../src/conversation_textview.py:693
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дії для «%s»"
 
-#: ../src/conversation_textview.py:701
+#: ../src/conversation_textview.py:705
 msgid "Read _Wikipedia Article"
 msgstr "Прочитати статтю у В_ікіпедії"
 
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:710
 msgid "Look it up in _Dictionary"
 msgstr "Пошукати це у _словнику"
 
-#: ../src/conversation_textview.py:723
+#: ../src/conversation_textview.py:727
 #, 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:736
+#: ../src/conversation_textview.py:740
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адресі URL для пошуку у Тенетах не вказано «%s»"
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:743
 msgid "Web _Search for it"
 msgstr "Пошук у _Тенетах"
 
-#: ../src/conversation_textview.py:745
+#: ../src/conversation_textview.py:749
 msgid "Open as _Link"
 msgstr "Відкрити як _посилання"
 
-#: ../src/conversation_textview.py:1199
+#: ../src/conversation_textview.py:1203
 msgid "Yesterday"
 msgstr "Вчора"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1203
+#: ../src/conversation_textview.py:1207
 #, python-format
 msgid "%i days ago"
 msgstr "%i днів тому"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1237
+#: ../src/conversation_textview.py:1241
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -6524,138 +6513,138 @@
 msgid "In the group"
 msgstr "У групі"
 
-#: ../src/dialogs.py:276
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:281
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Ім'я контакту"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:460
 msgid "Set Mood"
 msgstr "Встановити настрій"
 
-#: ../src/dialogs.py:545
+#: ../src/dialogs.py:549
 #, python-format
 msgid "%s Status Message"
 msgstr "Повідомлення про стан %s"
 
-#: ../src/dialogs.py:547
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Повідомлення про стан"
 
-#: ../src/dialogs.py:659
+#: ../src/dialogs.py:664
 msgid "Overwrite Status Message?"
 msgstr "Перезаписати повідомлення про стан?"
 
-#: ../src/dialogs.py:660
+#: ../src/dialogs.py:665
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Цю назву вже було використано. Бажаєте перезаписати повідомлення про стан?"
 
-#: ../src/dialogs.py:669
+#: ../src/dialogs.py:674
 msgid "Save as Preset Status Message"
 msgstr "Зберегти як стандартне повідомлення про стан"
 
-#: ../src/dialogs.py:670
+#: ../src/dialogs.py:675
 msgid "Please type a name for this status message"
 msgstr "Будь ласка, введіть назву цього повідомлення про стан"
 
-#: ../src/dialogs.py:676
+#: ../src/dialogs.py:681
 msgid "AIM Address:"
 msgstr "Адреса AIM:"
 
-#: ../src/dialogs.py:677
+#: ../src/dialogs.py:682
 msgid "GG Number:"
 msgstr "Номер GG:"
 
-#: ../src/dialogs.py:678
+#: ../src/dialogs.py:683
 msgid "ICQ Number:"
 msgstr "Номер ICQ:"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:684
 msgid "MSN Address:"
 msgstr "Адреса MSN:"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:685
 msgid "Yahoo! Address:"
 msgstr "Адреса Yahoo!:"
 
-#: ../src/dialogs.py:716
+#: ../src/dialogs.py:721
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Будь ласка, вкажіть дані контакту, який ви бажаєте додати до облікового "
 "запису %s"
 
-#: ../src/dialogs.py:718
+#: ../src/dialogs.py:723
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Будь ласка, вкажіть дані контакту, який ви бажаєте додати"
 
-#: ../src/dialogs.py:875 ../src/dialogs.py:881 ../src/dialogs.py:886
+#: ../src/dialogs.py:880 ../src/dialogs.py:886 ../src/dialogs.py:891
 msgid "Invalid User ID"
 msgstr "Некоректний ідентифікатор користувача"
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:887
 msgid "The user ID must not contain a resource."
 msgstr "У ідентифікаторі користувача не повинно міститися назви ресурсу."
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:892
 msgid "You cannot add yourself to your roster."
 msgstr "Ви не можете додавати себе ж до реєстру."
 
-#: ../src/dialogs.py:901
+#: ../src/dialogs.py:906
 msgid "Contact already in roster"
 msgstr "Цей контакт вже є у реєстрі"
 
-#: ../src/dialogs.py:902
+#: ../src/dialogs.py:907
 msgid "This contact is already listed in your roster."
 msgstr "Цей контакт уже є у вашому реєстрі."
 
-#: ../src/dialogs.py:938
+#: ../src/dialogs.py:943
 msgid "User ID:"
 msgstr "Ідентифікатор:"
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1001
 msgid "A GTK+ jabber client"
 msgstr "Клієнт Jabber на GTK+"
 
-#: ../src/dialogs.py:997
+#: ../src/dialogs.py:1002
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:998
+#: ../src/dialogs.py:1003
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1008
+#: ../src/dialogs.py:1013
 msgid "Current Developers:"
 msgstr "Поточні розробники:"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1015
 msgid "Past Developers:"
 msgstr "Колишні розробники:"
 
-#: ../src/dialogs.py:1016
+#: ../src/dialogs.py:1021
 msgid "THANKS:"
 msgstr "ПОДЯКИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1022
+#: ../src/dialogs.py:1027
 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 at somewhere>
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1040
 msgid "translator-credits"
 msgstr "Raven's fans <translation at linux.org.ua>"
 
-#: ../src/dialogs.py:1197
+#: ../src/dialogs.py:1202
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6668,94 +6657,94 @@
 "\n"
 "Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
 
-#: ../src/dialogs.py:1601
+#: ../src/dialogs.py:1606
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запит на підписку до облікового запису %(account)s від %(jid)s"
 
-#: ../src/dialogs.py:1604
+#: ../src/dialogs.py:1609
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запит на підписку від %s"
 
-#: ../src/dialogs.py:1668 ../src/gajim.py:2767
+#: ../src/dialogs.py:1673 ../src/gajim.py:2773
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ви вже берете участь у груповій балачці %s"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1681
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
 
-#: ../src/dialogs.py:1695
+#: ../src/dialogs.py:1700
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Приєднатися до групової балачки з облікового запису %s"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:1771
 msgid "Invalid Nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1455
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:1772 ../src/groupchat_control.py:1441
+#: ../src/groupchat_control.py:1724
 msgid "The nickname has not allowed characters."
 msgstr "У псевдонімі є недозволені символи."
 
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1908
+#: ../src/dialogs.py:1776 ../src/dialogs.py:1782
+#: ../src/groupchat_control.py:1894
 msgid "Invalid group chat Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber групової балачки"
 
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1909
+#: ../src/dialogs.py:1777 ../src/dialogs.py:1783
+#: ../src/groupchat_control.py:1895
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "У ідентифікаторі Jabber групової балачки містяться недозволені символи."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:1789
 msgid "This is not a group chat"
 msgstr "Це не групова балачка"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:1790
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не є назвою групової балачки."
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:1817
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 "Для синхронізації ваших контактів потрібно встановити з’єднання облікового "
 "запису з сервером."
 
-#: ../src/dialogs.py:1826
+#: ../src/dialogs.py:1831
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1864
 msgid "This account is not connected to the server"
 msgstr "Цей обліковий запис не з’єднано з сервером"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:1865
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Можливістю синхронізації можна скористатися, лише якщо обліковий запис "
 "з’єднано з сервером."
 
-#: ../src/dialogs.py:1884
+#: ../src/dialogs.py:1889
 msgid "Synchronise"
 msgstr "Синхронізувати"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:1947
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Почати балачку з облікового запису %s"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:1949
 msgid "Start Chat"
 msgstr "Почати балачку"
 
-#: ../src/dialogs.py:1945
+#: ../src/dialogs.py:1950
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6764,275 +6753,276 @@
 "бажаєте надіслати повідомлення балачки:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2343 ../src/dialogs.py:2493
+#: ../src/dialogs.py:1974 ../src/dialogs.py:2348 ../src/dialogs.py:2498
 #: ../src/normal_control.py:640
 msgid "Connection not available"
 msgstr "З’єднання недоступне"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2344 ../src/dialogs.py:2494
+#: ../src/dialogs.py:1975 ../src/dialogs.py:2349 ../src/dialogs.py:2499
 #: ../src/normal_control.py:641
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:1984 ../src/dialogs.py:1987
 msgid "Invalid JID"
 msgstr "Некоректний JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:1987
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не вдалося обробити «%s»."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:1996
 msgid "Without a connection, you can not change your password."
 msgstr "До встановлення з’єднання ви не зможете змінити ваш пароль."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2015
 msgid "Invalid password"
 msgstr "Некоректний пароль"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2015
 msgid "You must enter a password."
 msgstr "Вам слід ввести пароль."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2019
 msgid "Passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2020
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі, введені у обидва поля, мають бути тотожними."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2055 ../src/notify.py:245 ../src/notify.py:473
+#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:505
 #: ../src/osx/growler.py:12
 msgid "Contact Signed In"
 msgstr "Контакт увійшов до мережі"
 
-#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:475
+#: ../src/dialogs.py:2062 ../src/notify.py:272 ../src/notify.py:507
 #: ../src/osx/growler.py:12
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
 #. chat message
-#: ../src/dialogs.py:2059 ../src/notify.py:276 ../src/notify.py:477
-#: ../src/osx/growler.py:12
+#. img to display
+#: ../src/dialogs.py:2064 ../src/notify.py:295 ../src/notify.py:349
+#: ../src/notify.py:509 ../src/osx/growler.py:12
 msgid "New Message"
 msgstr "Нове повідомлення"
 
 #. single message
-#: ../src/dialogs.py:2059 ../src/notify.py:257 ../src/notify.py:477
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2064 ../src/notify.py:276 ../src/notify.py:350
+#: ../src/notify.py:509 ../src/osx/growler.py:13
 msgid "New Single Message"
 msgstr "Створити окреме повідомлення"
 
 #. private message
-#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:478
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2065 ../src/notify.py:283 ../src/notify.py:350
+#: ../src/notify.py:510 ../src/osx/growler.py:13
 msgid "New Private Message"
 msgstr "Нове конфіденційне повідомлення"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1685 ../src/notify.py:487
+#: ../src/dialogs.py:2065 ../src/gajim.py:1675 ../src/notify.py:519
 #: ../src/osx/growler.py:13
 msgid "New E-mail"
 msgstr "Нове повідомлення електронної пошти"
 
-#: ../src/dialogs.py:2062 ../src/gajim.py:1751 ../src/notify.py:480
+#: ../src/dialogs.py:2067 ../src/gajim.py:1741 ../src/notify.py:512
 #: ../src/osx/growler.py:14
 msgid "File Transfer Request"
 msgstr "Запит на передавання файла"
 
-#: ../src/dialogs.py:2064 ../src/gajim.py:1651 ../src/gajim.py:1718
-#: ../src/notify.py:482 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2069 ../src/gajim.py:1641 ../src/gajim.py:1708
+#: ../src/notify.py:514 ../src/osx/growler.py:14
 msgid "File Transfer Error"
 msgstr "Помилка під час передавання файла"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1793 ../src/gajim.py:1815
-#: ../src/gajim.py:1832 ../src/notify.py:484 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2071 ../src/gajim.py:1783 ../src/gajim.py:1805
+#: ../src/gajim.py:1822 ../src/notify.py:516 ../src/osx/growler.py:15
 msgid "File Transfer Completed"
 msgstr "Завершення передавання файла"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1796 ../src/notify.py:485
+#: ../src/dialogs.py:2072 ../src/gajim.py:1786 ../src/notify.py:517
 #: ../src/osx/growler.py:15
 msgid "File Transfer Stopped"
 msgstr "Зупинка передавання файла"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1503 ../src/notify.py:489
+#: ../src/dialogs.py:2074 ../src/gajim.py:1493 ../src/notify.py:521
 #: ../src/osx/growler.py:16
 msgid "Groupchat Invitation"
 msgstr "Запрошення до групової балачки"
 
-#: ../src/dialogs.py:2071 ../src/notify.py:237 ../src/notify.py:491
+#: ../src/dialogs.py:2076 ../src/notify.py:256 ../src/notify.py:523
 #: ../src/osx/growler.py:16
 msgid "Contact Changed Status"
 msgstr "Зміна контактом стану"
 
-#: ../src/dialogs.py:2262 ../src/normal_control.py:241
+#: ../src/dialogs.py:2267 ../src/normal_control.py:241
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Окреме повідомлення з використанням облікового запису %s"
 
-#: ../src/dialogs.py:2264 ../src/normal_control.py:243
+#: ../src/dialogs.py:2269 ../src/normal_control.py:243
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Окреме повідомлення для облікового запису %s"
 
-#: ../src/dialogs.py:2266 ../src/normal_control.py:245
+#: ../src/dialogs.py:2271 ../src/normal_control.py:245
 msgid "Single Message"
 msgstr "Окреме повідомлення"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2269 ../src/normal_control.py:248
+#: ../src/dialogs.py:2274 ../src/normal_control.py:248
 #, python-format
 msgid "Send %s"
 msgstr "Надіслати %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2292 ../src/normal_control.py:290
+#: ../src/dialogs.py:2297 ../src/normal_control.py:290
 #, python-format
 msgid "Received %s"
 msgstr "Отримано %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2315 ../src/normal_control.py:324
+#: ../src/dialogs.py:2320 ../src/normal_control.py:324
 #, 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:2394 ../src/normal_control.py:692
+#: ../src/dialogs.py:2399 ../src/normal_control.py:692
 #, python-format
 msgid "RE: %s"
 msgstr "Відповідь: %s"
 
-#: ../src/dialogs.py:2395 ../src/normal_control.py:696
+#: ../src/dialogs.py:2400 ../src/normal_control.py:696
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написав(-ла):\n"
 
-#: ../src/dialogs.py:2439
+#: ../src/dialogs.py:2444
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:2441
+#: ../src/dialogs.py:2446
 msgid "XML Console"
 msgstr "Консоль XML"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2570
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Списки конфіденційності <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2569
+#: ../src/dialogs.py:2574
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:2625
+#: ../src/dialogs.py:2630
 #, 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:2630
+#: ../src/dialogs.py:2635
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Порядок: %(order)s, дія: %(action)s"
 
-#: ../src/dialogs.py:2672
+#: ../src/dialogs.py:2677
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редагувати правило</b>"
 
-#: ../src/dialogs.py:2759
+#: ../src/dialogs.py:2764
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додати правило</b>"
 
-#: ../src/dialogs.py:2855
+#: ../src/dialogs.py:2860
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:2857
+#: ../src/dialogs.py:2862
 msgid "Privacy Lists"
 msgstr "Списки конфіденційності"
 
-#: ../src/dialogs.py:2927
+#: ../src/dialogs.py:2932
 msgid "Invalid List Name"
 msgstr "Некоректна назва списку"
 
-#: ../src/dialogs.py:2928
+#: ../src/dialogs.py:2933
 msgid "You must enter a name to create a privacy list."
 msgstr "Для створення списку конфіденційності вам слід ввести його назву."
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:2965
 msgid "You are invited to a groupchat"
 msgstr "Вас запрошено до групової балачки"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:2968
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запросив вас до участі у обговоренні"
 
-#: ../src/dialogs.py:2965
+#: ../src/dialogs.py:2970
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запросив вас до групової балачки %(room_jid)s"
 
-#: ../src/dialogs.py:2973
+#: ../src/dialogs.py:2978
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:2975
+#: ../src/dialogs.py:2980
 msgid "Do you want to accept the invitation?"
 msgstr "Чи бажаєте ви прийняти це запрошення?"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3036
 msgid "Choose Sound"
 msgstr "Обрати звук"
 
-#: ../src/dialogs.py:3040 ../src/dialogs.py:3091
+#: ../src/dialogs.py:3046 ../src/dialogs.py:3097
 msgid "All files"
 msgstr "Всі файли"
 
-#: ../src/dialogs.py:3045
+#: ../src/dialogs.py:3051
 msgid "Wav Sounds"
 msgstr "Звуки wav"
 
-#: ../src/dialogs.py:3078
+#: ../src/dialogs.py:3084
 msgid "Choose Image"
 msgstr "Вибрати зображення"
 
-#: ../src/dialogs.py:3096
+#: ../src/dialogs.py:3102
 msgid "Images"
 msgstr "Зображення"
 
-#: ../src/dialogs.py:3161
+#: ../src/dialogs.py:3167
 #, python-format
 msgid "When %s becomes:"
 msgstr "Якщо %s стане рівним:"
 
-#: ../src/dialogs.py:3163
+#: ../src/dialogs.py:3169
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавання особливого сповіщення для %s"
 
 #. # means number
-#: ../src/dialogs.py:3232
+#: ../src/dialogs.py:3238
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3238
+#: ../src/dialogs.py:3244
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3362
 msgid "when I am "
 msgstr "якщо я "
 
-#: ../src/dialogs.py:3828
+#: ../src/dialogs.py:3834
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7043,19 +7033,19 @@
 "\n"
 "Коротким рядком розпізнавання (SAS) цього сеансу є <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3832
+#: ../src/dialogs.py:3838
 msgid "You have already verified this contact's identity."
 msgstr "Ви вже перевіряли особу контакту."
 
-#: ../src/dialogs.py:3838 ../src/dialogs.py:3925
+#: ../src/dialogs.py:3844 ../src/dialogs.py:3931
 msgid "Contact's identity verified"
 msgstr "Особу контакту перевірено"
 
-#: ../src/dialogs.py:3846
+#: ../src/dialogs.py:3852
 msgid "Verify again..."
 msgstr "Повторити перевірку..."
 
-#: ../src/dialogs.py:3851
+#: ../src/dialogs.py:3857
 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 "
@@ -7065,19 +7055,19 @@
 "бажана особа, і що ця лише ця особа матиме змогу надсилати вам повідомлення, "
 "вам слід підтвердити їх ідентичність натисканням кнопки, розташованої нижче."
 
-#: ../src/dialogs.py:3854 ../src/dialogs.py:3906 ../src/dialogs.py:3919
+#: ../src/dialogs.py:3860 ../src/dialogs.py:3912 ../src/dialogs.py:3925
 msgid "Contact's identity NOT verified"
 msgstr "Особу контакту НЕ перевірено"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:3867
 msgid "Verify..."
 msgstr "Перевірити..."
 
-#: ../src/dialogs.py:3873
+#: ../src/dialogs.py:3879
 msgid "Have you verified the contact's identity?"
 msgstr "Чи перевірили ви особу контакту?"
 
-#: ../src/dialogs.py:3874
+#: ../src/dialogs.py:3880
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7092,24 +7082,24 @@
 "\n"
 "Коротким рядком розпізнавання у цьому сеансі буде <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3875
+#: ../src/dialogs.py:3881
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Ви зв’язалися з контактом і перевірили SAS?"
 
-#: ../src/dialogs.py:3907
+#: ../src/dialogs.py:3913
 #, 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:3913
+#: ../src/dialogs.py:3919
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/dialogs.py:3920
+#: ../src/dialogs.py:3926
 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."
@@ -7118,7 +7108,7 @@
 "b>, отже повідомлення <b>не може</b> бути зашифрованим. Для того, щоб "
 "встановити надійність цього ключа, скористайтесь вашим клієнтом GPG."
 
-#: ../src/dialogs.py:3926
+#: ../src/dialogs.py:3932
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7235,7 +7225,6 @@
 msgstr "_Скасувати підписку"
 
 #: ../src/features_window.py:45
-#, fuzzy
 msgid "SSL certificat validation"
 msgstr "Помилка сертифіката SSL"
 
@@ -7269,7 +7258,6 @@
 msgstr "Потрібен pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
 #: ../src/features_window.py:53
-#, fuzzy
 msgid "Command line"
 msgstr "Команди:·%s"
 
@@ -7289,12 +7277,10 @@
 msgstr "Цією можливістю не можна скористатися у Windows."
 
 #: ../src/features_window.py:57
-#, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Вибір ключа OpenPGP"
 
 #: ../src/features_window.py:58
-#, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Шифрування повідомлень балачки за допомогою ключів gpg."
 
@@ -7303,7 +7289,6 @@
 msgstr "Потрібні gpg і python-GnuPGInterface."
 
 #: ../src/features_window.py:61
-#, fuzzy
 msgid "Network-manager"
 msgstr "network-manager"
 
@@ -7330,7 +7315,6 @@
 msgstr "Потрібен python-gnome2."
 
 #: ../src/features_window.py:69
-#, fuzzy
 msgid "Password encryption"
 msgstr "Пароль для входу до кімнати"
 
@@ -7367,12 +7351,10 @@
 msgstr "Перевірка правопису повідомлень, які ви створюєте."
 
 #: ../src/features_window.py:79
-#, fuzzy
 msgid "Requires libgtkspell."
 msgstr "Потрібна бібліотека libxss."
 
 #: ../src/features_window.py:81
-#, fuzzy
 msgid "Notification"
 msgstr "Сповіщення"
 
@@ -7408,7 +7390,6 @@
 msgstr "Потрібний PyGTK >= 2.10."
 
 #: ../src/features_window.py:89
-#, fuzzy
 msgid "Automatic status"
 msgstr "_Узгодити зі станом"
 
@@ -7452,12 +7433,10 @@
 "додаткових налаштувань."
 
 #: ../src/features_window.py:97
-#, fuzzy
 msgid "End to End message encryption"
 msgstr "Шифрування E2E"
 
 #: ../src/features_window.py:98
-#, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Шифрування повідомлень балачки."
 
@@ -7483,7 +7462,7 @@
 
 #: ../src/features_window.py:105
 msgid "Banners and clickable links"
-msgstr ""
+msgstr "Банери та активні посилання"
 
 #: ../src/features_window.py:106
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
@@ -7516,7 +7495,7 @@
 msgid "Filename: %s"
 msgstr "Назва файла: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:314
 #, python-format
 msgid "Size: %s"
 msgstr "Розмір: %s"
@@ -7533,7 +7512,7 @@
 msgid "Sender: %s"
 msgstr "Відправник: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:597
 #: ../src/tooltips.py:671
 msgid "Recipient: "
 msgstr "Отримувач:"
@@ -7590,60 +7569,60 @@
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:317
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:320
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s бажає надіслати вам файл:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:817
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:817
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не вдалося перезаписати існуючий файл «%s»"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:819
+#: ../src/filetransfers_window.py:334 ../src/gtkgui_helpers.py:819
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Файл з такою назвою вже існує, у вас немає дозволів для його перезапису."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
 msgid "This file already exists"
 msgstr "Файл з такою назвою вже існує."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
 msgid "What do you want to do?"
 msgstr "Що ви хочете зробити?"
 
 #. read-only bit is used to mark special folder under windows,
 #. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:830
+#: ../src/filetransfers_window.py:360 ../src/gtkgui_helpers.py:830
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Запис до каталогу «%s» неможливий"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:831
+#: ../src/filetransfers_window.py:360 ../src/gtkgui_helpers.py:831
 msgid "You do not have permission to create files in this directory."
 msgstr "Ваш користувач не має права на створення файлів у цьому каталозі."
 
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:370
 msgid "Save File as..."
 msgstr "Зберегти файл як..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:435
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7651,68 +7630,63 @@
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:526
+#: ../src/filetransfers_window.py:527
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:567 ../src/filetransfers_window.py:570
 msgid "Invalid File"
 msgstr "Некоректний файл"
 
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:567
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:571
 msgid "It is not possible to send empty files"
 msgstr "Надсилання порожніх файлів не передбачено"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:593 ../src/tooltips.py:661
 msgid "Name: "
 msgstr "Назва: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:595 ../src/tooltips.py:665
 msgid "Sender: "
 msgstr "Відправник:"
 
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:782
 msgid "Pause"
 msgstr "Призупинити"
 
-#: ../src/gajim.py:92
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s не є коректним рівнем журналювання"
-
-#: ../src/gajim.py:164
+#: ../src/gajim.py:145
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Для роботи Gajim потрібен запущений сервер X. Завершення роботи..."
 
-#: ../src/gajim.py:193
+#: ../src/gajim.py:174
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Для роботи Gajim потрібен PyGTK 2.8 або новіша версія"
 
-#: ../src/gajim.py:194
+#: ../src/gajim.py:175
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr ""
 "Для запуску Gajim потрібен PyGTK 2.8 або новіша версія. Завершення роботи..."
 
-#: ../src/gajim.py:196
+#: ../src/gajim.py:177
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Для роботи Gajim потрібна бібліотека GTK 2.8 або новіша версія"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:178
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr ""
 "Для запуску Gajim потрібна бібліотека GTK 2.8 або новіша версія. Завершення "
 "роботи..."
 
-#: ../src/gajim.py:202
+#: ../src/gajim.py:183
 msgid "GTK+ runtime is missing libglade support"
 msgstr "У середовищі виконання GTK+ відсутня підтримка libglade"
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:185
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7721,22 +7695,22 @@
 "Будь ласка, вилучіть поточні бібліотеки GTK+ з системи і встановіть останню "
 "стабільну версію цих бібліотек, яку можна знайти за адресою %s"
 
-#: ../src/gajim.py:206
+#: ../src/gajim.py:187
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Будь ласка, перевірте, чи увімкнено підтримку libglade у GTK+ і PyGTK на "
 "вашій системі."
 
-#: ../src/gajim.py:211
+#: ../src/gajim.py:192
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Для запуску Gajim потрібен PySQLite2"
 
-#: ../src/gajim.py:219
+#: ../src/gajim.py:200
 msgid "Gajim needs pywin32 to run"
 msgstr "Для роботи Gajim потрібен pywin32"
 
-#: ../src/gajim.py:220
+#: ../src/gajim.py:201
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7746,11 +7720,11 @@
 "Звантажити цю програму можна за адресою %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:374
+#: ../src/gajim.py:352
 msgid "Gajim is already running"
 msgstr "Gajim вже запущено"
 
-#: ../src/gajim.py:375
+#: ../src/gajim.py:353
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7758,36 +7732,35 @@
 "Здається, вже запущено інший екземпляр Gajim.\n"
 "Запустити ще один екземпляр?"
 
-#: ../src/gajim.py:460
+#: ../src/gajim.py:443
 msgid "Passphrase Required"
 msgstr "Слід вказати пароль"
 
-#: ../src/gajim.py:461
+#: ../src/gajim.py:444
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введіть пароль ключа GPG для ключа %(keyid)s (account %(account)s)."
 
-#: ../src/gajim.py:475
-#, fuzzy
+#: ../src/gajim.py:458
 msgid "GPG key expired"
 msgstr "Немає ключа GPG"
 
-#: ../src/gajim.py:476
-#, fuzzy, python-format
+#: ../src/gajim.py:459
+#, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "З’єднання з %s буде встановлено без OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:485
+#: ../src/gajim.py:468
 msgid "Wrong Passphrase"
 msgstr "Вказано помилковий пароль"
 
-#: ../src/gajim.py:486
+#: ../src/gajim.py:469
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
 
-#: ../src/gajim.py:549
+#: ../src/gajim.py:532
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7798,55 +7771,54 @@
 "використовує інший учасник.\n"
 "Будь ласка, вкажіть нижче інший псевдонім:"
 
-#: ../src/gajim.py:563
+#: ../src/gajim.py:546
 msgid "Do you accept this request?"
 msgstr "Чи приймаєте ви цей запит?"
 
-#: ../src/gajim.py:565
+#: ../src/gajim.py:548
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
 
-#: ../src/gajim.py:568
+#: ../src/gajim.py:551
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) уповноваження для %(url)s (ідентифікатор: %(id)s)"
 
-#: ../src/gajim.py:619 ../src/notify.py:493 ../src/osx/growler.py:17
+#: ../src/gajim.py:602 ../src/notify.py:525 ../src/osx/growler.py:17
 msgid "Connection Failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/gajim.py:937 ../src/gajim.py:941
+#: ../src/gajim.py:926 ../src/gajim.py:930
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Помилка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:951 ../src/gajim.py:965
+#: ../src/gajim.py:940 ../src/gajim.py:954
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "помилка під час надсилання %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:988 ../src/notify.py:495
-#, fuzzy
+#: ../src/gajim.py:977 ../src/notify.py:527
 msgid "Subscription request"
 msgstr "Запит на підписку"
 
-#: ../src/gajim.py:1013
+#: ../src/gajim.py:1002
 msgid "Authorization accepted"
 msgstr "Уповноваження прийнято"
 
-#: ../src/gajim.py:1014
+#: ../src/gajim.py:1003
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
 
-#: ../src/gajim.py:1026
+#: ../src/gajim.py:1015
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» вилучив вашу підписку"
 
-#: ../src/gajim.py:1027
+#: ../src/gajim.py:1016
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7854,78 +7826,77 @@
 "Цей контакт завжди буде показано зі станом «поза мережею».\n"
 "Бажаєте вилучити контакт з вашого списку контактів?"
 
-#: ../src/gajim.py:1052 ../src/notify.py:497
-#, fuzzy
+#: ../src/gajim.py:1041 ../src/notify.py:529
 msgid "Unsubscribed"
-msgstr "_Скасувати підписку"
+msgstr "_Непідписаний"
 
-#: ../src/gajim.py:1093
+#: ../src/gajim.py:1082
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Зв’язок з «%s» встановити не вдалося"
 
-#: ../src/gajim.py:1281 ../src/groupchat_control.py:1166
+#: ../src/gajim.py:1271 ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s тепер стає %(new_nick)s"
 
-#: ../src/gajim.py:1299 ../src/groupchat_control.py:1341
-#: ../src/history_window.py:428 ../src/notify.py:232
+#: ../src/gajim.py:1289 ../src/groupchat_control.py:1327
+#: ../src/history_window.py:428 ../src/notify.py:251
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s тепер %(status)s"
 
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1356
 #, 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:1430 ../src/groupchat_control.py:1126
+#: ../src/gajim.py:1420 ../src/groupchat_control.py:1112
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Всі учасники можуть бачити ваш JID повністю"
 
-#: ../src/gajim.py:1433
+#: ../src/gajim.py:1423
 msgid "Room now shows unavailable member"
 msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
 
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1425
 msgid "room now does not show unavailable members"
 msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
 
-#: ../src/gajim.py:1438
+#: ../src/gajim.py:1428
 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:1441
+#: ../src/gajim.py:1431
 msgid "Room logging is now enabled"
 msgstr "Тепер увімкнено запис повідомлень кімнати"
 
-#: ../src/gajim.py:1443
+#: ../src/gajim.py:1433
 msgid "Room logging is now disabled"
 msgstr "Тепер запис кімнати вимкнено"
 
-#: ../src/gajim.py:1445
+#: ../src/gajim.py:1435
 msgid "Room is now non-anonymous"
 msgstr "Тепер у кімнаті вимкнено анонімність"
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1438
 msgid "Room is now semi-anonymous"
 msgstr "Тепер у кімнаті увімкнено напіванонімність"
 
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1441
 msgid "Room is now fully-anonymous"
 msgstr "Тепер у кімнаті увімкнено анонімність"
 
-#: ../src/gajim.py:1483
+#: ../src/gajim.py:1473
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
 
-#: ../src/gajim.py:1517
+#: ../src/gajim.py:1507
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7933,21 +7904,19 @@
 "Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено "
 "або цей агент повернув помилковий пароль.\n"
 
-#: ../src/gajim.py:1519
+#: ../src/gajim.py:1509
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Ви виконали з’єднання без вашого ключа OpenPGP."
 
-#: ../src/gajim.py:1522
+#: ../src/gajim.py:1512
 msgid "Your passphrase is incorrect"
 msgstr "Ваш пароль не є коректним"
 
-#: ../src/gajim.py:1545
-#, fuzzy
+#: ../src/gajim.py:1535
 msgid "GPG key not trusted"
 msgstr "GPG непридатне для використання"
 
-#: ../src/gajim.py:1545
-#, fuzzy
+#: ../src/gajim.py:1535
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -7955,26 +7924,25 @@
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/gajim.py:1547 ../src/gajim.py:2185 ../src/gajim.py:2220
-#: ../src/groupchat_control.py:1849 ../src/roster_window.py:3826
+#: ../src/gajim.py:1537 ../src/gajim.py:2184 ../src/gajim.py:2219
+#: ../src/groupchat_control.py:1835 ../src/roster_window.py:3828
 msgid "Do _not ask me again"
 msgstr "Більше _не питати мене"
 
-#: ../src/gajim.py:1555
-#, fuzzy
+#: ../src/gajim.py:1545
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
 msgstr ""
-"Gnome Keyring встановлено, але не \t\t\t\t\t\t\tзапущено належним чином "
-"(ймовірно, змінну середовища вказано \t\t\t\t\t\t\tнеправильно)"
+"Gnome Keyring встановлено, але не \t\t\t\t\tзапущено належним чином "
+"(ймовірно, змінну середовища вказано \t\t\t\t\tнеправильно)"
 
-#: ../src/gajim.py:1662
+#: ../src/gajim.py:1652
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нові повідомлення у %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1664
+#: ../src/gajim.py:1654
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7982,7 +7950,7 @@
 msgstr[1] "Отримано %d нових листи"
 msgstr[2] "Отримано %d нових листів"
 
-#: ../src/gajim.py:1677
+#: ../src/gajim.py:1667
 #, python-format
 msgid ""
 "\n"
@@ -7997,34 +7965,34 @@
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1748
+#: ../src/gajim.py:1738
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s бажає надіслати вам файл."
 
-#: ../src/gajim.py:1816
+#: ../src/gajim.py:1806
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Ви успішно отримали %(filename)s від %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1820
+#: ../src/gajim.py:1810
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
 
-#: ../src/gajim.py:1833
+#: ../src/gajim.py:1823
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Ви успішно надіслали %(filename)s до %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1837
+#: ../src/gajim.py:1827
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
 
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:1924
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8033,38 +8001,38 @@
 "Не вдалося розшифрувати повідомлення від %s\n"
 "Можливо, хтось втрутився у ваше з’єднання."
 
-#: ../src/gajim.py:1932
+#: ../src/gajim.py:1931
 msgid "Unable to decrypt message"
 msgstr "Не вдалося розшифрувати повідомлення"
 
-#: ../src/gajim.py:2006
+#: ../src/gajim.py:2005
 msgid "Username Conflict"
 msgstr "Конфлікт імен користувачів"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2006
 msgid "Please type a new username for your local account"
 msgstr ""
 "Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
 "запису"
 
-#: ../src/gajim.py:2019
+#: ../src/gajim.py:2018
 msgid "Ping?"
 msgstr "Гу?"
 
-#: ../src/gajim.py:2032
+#: ../src/gajim.py:2031
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Га! (%s s.)"
 
-#: ../src/gajim.py:2043
+#: ../src/gajim.py:2042
 msgid "Error."
 msgstr "Помилка."
 
-#: ../src/gajim.py:2068
+#: ../src/gajim.py:2067
 msgid "Resource Conflict"
 msgstr "Конфлікт ресурсів"
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2068
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8072,11 +8040,11 @@
 "Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь "
 "ласка, вкажіть інший ресурс"
 
-#: ../src/gajim.py:2124
+#: ../src/gajim.py:2123
 msgid "Error verifying SSL certificate"
 msgstr "Помилка під час перевірки сертифіката SSL"
 
-#: ../src/gajim.py:2125
+#: ../src/gajim.py:2124
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8087,16 +8055,16 @@
 "помилка: %(error)s\n"
 "Ви все ще маєте намір з’єднатися з сервером?"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2129
 msgid "Ignore this error for this certificate."
 msgstr "Ігнорувати цю помилку для цього сертифіката."
 
-#: ../src/gajim.py:2150
+#: ../src/gajim.py:2149
 msgid "SSL certificate error"
 msgstr "Помилка сертифіката SSL"
 
-#: ../src/gajim.py:2151
-#, fuzzy, python-format
+#: ../src/gajim.py:2150
+#, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
 "connection is being hacked.\n"
@@ -8105,17 +8073,18 @@
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
-"Здається сертифікат SSL було змінено або хтось втрутився у ваше з’єднання.\n"
+"Здається сертифікат SSL облікового запису  %(account)s було змінено або "
+"хтось втрутився у ваше з’єднання.\n"
 "Старий відбиток: %(old)s\n"
 "Новий відбиток: %(new)s\n"
 "\n"
 "Ви все ще маєте намір з’єднатися і оновити відбиток сертифіката?"
 
-#: ../src/gajim.py:2181 ../src/gajim.py:2216
+#: ../src/gajim.py:2180 ../src/gajim.py:2215
 msgid "Insecure connection"
 msgstr "Небезпечне з’єднання"
 
-#: ../src/gajim.py:2182
+#: ../src/gajim.py:2181
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8123,11 +8092,11 @@
 "Ви маєте намір надіслати ваш пароль нешифрованим з’єднанням. Виконати "
 "надсилання пароля?"
 
-#: ../src/gajim.py:2184 ../src/gajim.py:2219
+#: ../src/gajim.py:2183 ../src/gajim.py:2218
 msgid "Yes, I really want to connect insecurely"
 msgstr "Так, я справді бажаю знехтувати безпекою"
 
-#: ../src/gajim.py:2217
+#: ../src/gajim.py:2216
 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?"
@@ -8136,27 +8105,27 @@
 "безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля "
 "зараз?"
 
-#: ../src/gajim.py:2237
+#: ../src/gajim.py:2236
 msgid "PEP node was not removed"
 msgstr "Вузол повідомлення про стан було вилучено"
 
-#: ../src/gajim.py:2238
+#: ../src/gajim.py:2237
 #, 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:2724 ../src/gajim.py:2746
+#: ../src/gajim.py:2730 ../src/gajim.py:2752
 msgid "Emoticons disabled"
 msgstr "Емоційки вимкнено"
 
-#: ../src/gajim.py:2725
+#: ../src/gajim.py:2731
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
 
-#: ../src/gajim.py:2747
+#: ../src/gajim.py:2753
 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 "
@@ -8166,30 +8135,30 @@
 "формат файла emoticons.py. Докладніше про новий формат можна дізнатися за "
 "адресою http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2773 ../src/roster_window.py:3314
+#: ../src/gajim.py:2779 ../src/roster_window.py:3316
 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:3051
+#: ../src/gajim.py:3057
 msgid "Could not save your settings and preferences"
 msgstr "Не вдалося зберегти ваші налаштування і параметри"
 
-#: ../src/gajim.py:3148
+#: ../src/gajim.py:3154
 msgid "Bookmark already set"
 msgstr "Закладку вже встановлено"
 
-#: ../src/gajim.py:3149
+#: ../src/gajim.py:3155
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Закладка на груповій балачці «%s» вже існує."
 
-#: ../src/gajim.py:3162
+#: ../src/gajim.py:3168
 msgid "Bookmark has been added successfully"
 msgstr "Закладку було успішно додано"
 
-#: ../src/gajim.py:3163
+#: ../src/gajim.py:3169
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
@@ -8646,128 +8615,117 @@
 msgid "Continued conversation"
 msgstr "Спілкування з продовженням"
 
-#: ../src/groupchat_control.py:1014
-msgid "Really send file?"
-msgstr "Справді надіслати файл?"
-
-#: ../src/groupchat_control.py:1015
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-"Якщо ви надішлете файл %s, він або вона дізнаються про ваш справжній "
-"ідентифікатор Jabber."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1115
 msgid "Room logging is enabled"
 msgstr "Увімкнено запис кімнати"
 
-#: ../src/groupchat_control.py:1131
+#: ../src/groupchat_control.py:1117
 msgid "A new room has been created"
 msgstr "Було створено нову кімнату"
 
-#: ../src/groupchat_control.py:1134
+#: ../src/groupchat_control.py:1120
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер призначив вам псевдонім у кімнаті або змінив цей псевдонім"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1140
+#: ../src/groupchat_control.py:1126
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s було викинуто: %(reason)s"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1130
 #, 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:1151
+#: ../src/groupchat_control.py:1137
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s було заблоковано: %(reason)s"
 
-#: ../src/groupchat_control.py:1155
+#: ../src/groupchat_control.py:1141
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s було заблоковано %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1164
+#: ../src/groupchat_control.py:1150
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ви тепер відомі як %s"
 
-#: ../src/groupchat_control.py:1202 ../src/groupchat_control.py:1206
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1188 ../src/groupchat_control.py:1192
+#: ../src/groupchat_control.py:1197
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
 
-#: ../src/groupchat_control.py:1203
+#: ../src/groupchat_control.py:1189
 msgid "affiliation changed"
 msgstr "змінено місце роботи"
 
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1194
 msgid "room configuration changed to members-only"
 msgstr "налаштування кімнати змінено на «лише для постійних учасників»"
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1199
 msgid "system shutdown"
 msgstr "вимкнення системи"
 
-#: ../src/groupchat_control.py:1282
+#: ../src/groupchat_control.py:1268
 #, 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:1286
+#: ../src/groupchat_control.py:1272
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Належність of %(nick)s було встановлено у значення %(affiliation)s"
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1287
 #, 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:1305
+#: ../src/groupchat_control.py:1291
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s"
 
-#: ../src/groupchat_control.py:1334
+#: ../src/groupchat_control.py:1320
 #, python-format
 msgid "%s has left"
 msgstr "%s вийшов"
 
-#: ../src/groupchat_control.py:1339
+#: ../src/groupchat_control.py:1325
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s приєднався до групової балачки"
 
 #. Invalid Nickname
 #. invalid char
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1737
+#: ../src/groupchat_control.py:1440 ../src/groupchat_control.py:1723
 msgid "Invalid nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/groupchat_control.py:1478 ../src/groupchat_control.py:1496
-#: ../src/groupchat_control.py:1582 ../src/groupchat_control.py:1599
+#: ../src/groupchat_control.py:1464 ../src/groupchat_control.py:1482
+#: ../src/groupchat_control.py:1568 ../src/groupchat_control.py:1585
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Псевдоніма не знайдено: %s"
 
-#: ../src/groupchat_control.py:1512
+#: ../src/groupchat_control.py:1498
 msgid "This group chat has no subject"
 msgstr "У цієї групової балачки немає певної теми"
 
-#: ../src/groupchat_control.py:1524
+#: ../src/groupchat_control.py:1510
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s запрошено до %(room_jid)s."
 
-#: ../src/groupchat_control.py:1660
+#: ../src/groupchat_control.py:1646
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8781,7 +8739,7 @@
 "участь у груповій балачці, її буде викинуто з балачки. Пробіли у псевдонімі "
 "НЕ підтримуються."
 
-#: ../src/groupchat_control.py:1667
+#: ../src/groupchat_control.py:1653
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8790,7 +8748,7 @@
 "Використання: /%s <nickname>, відкрити вікно конфіденційної балачки з "
 "вказаним учасником."
 
-#: ../src/groupchat_control.py:1673
+#: ../src/groupchat_control.py:1659
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8799,7 +8757,7 @@
 "Використання: /%s [причина], закрити поточне вікно або вкладку з показом "
 "причини, якщо таку вказано."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1665
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8808,7 +8766,7 @@
 "Використання: /%s <JID> [причина], запросити JID до групової балачки з "
 "необов’язковим зазначенням причини."
 
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room at server optionally "
@@ -8817,7 +8775,7 @@
 "Використання: /%s <кімната>@<сервер>[/псевдонім], приєднатися до кімнати на "
 "сервері з необов’язковим вказаним псевдонімом."
 
-#: ../src/groupchat_control.py:1687
+#: ../src/groupchat_control.py:1673
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8828,7 +8786,7 @@
 "псевдонімом з групової балачки з необов’язковим зазначенням причини. Пробіли "
 "у псевдонімах НЕ підтримуються."
 
-#: ../src/groupchat_control.py:1696
+#: ../src/groupchat_control.py:1682
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8837,25 +8795,25 @@
 "Використання: /%s <nickname> [message], відкрити вікно конфіденційного "
 "повідомлення і надіслати це повідомлення учаснику з вказаним псевдонімом."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1687
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Використання: /%s <псевдонім>, змінити ваш псевдонім у поточній груповій "
 "балачці."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1691
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Використання: /%s , показати імена учасників групової балачки."
 
-#: ../src/groupchat_control.py:1709
+#: ../src/groupchat_control.py:1695
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Використання: /%s [тема], показати або оновити поточну тему групової балачки."
 
-#: ../src/groupchat_control.py:1712
+#: ../src/groupchat_control.py:1698
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8863,39 +8821,39 @@
 "Використання: /%s <message>, надіслати повідомлення без використання інших "
 "команд."
 
-#: ../src/groupchat_control.py:1843
+#: ../src/groupchat_control.py:1829
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
 
-#: ../src/groupchat_control.py:1845
+#: ../src/groupchat_control.py:1831
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки."
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1868
 msgid "Changing Subject"
 msgstr "Зміна теми"
 
-#: ../src/groupchat_control.py:1883
+#: ../src/groupchat_control.py:1869
 msgid "Please specify the new subject:"
 msgstr "Будь ласка, вкажіть нову тему:"
 
-#: ../src/groupchat_control.py:1887
+#: ../src/groupchat_control.py:1873
 msgid "Changing Nickname"
 msgstr "Зміна псевдоніма"
 
-#: ../src/groupchat_control.py:1888
+#: ../src/groupchat_control.py:1874
 msgid "Please specify the new nickname you want to use:"
 msgstr "Будь ласка, вкажіть новий псевдонім, яким ви бажаєте скористатися:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1915
+#: ../src/groupchat_control.py:1901
 #, python-format
 msgid "Destroying %s"
 msgstr "Знищення %s"
 
-#: ../src/groupchat_control.py:1916
+#: ../src/groupchat_control.py:1902
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8903,22 +8861,22 @@
 "Ви маєте намір знищити цю кімнату.\n"
 "Нижче ви можете вказати причину цього рішення:"
 
-#: ../src/groupchat_control.py:1918
+#: ../src/groupchat_control.py:1904
 msgid "You may also enter an alternate venue:"
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2089
+#: ../src/groupchat_control.py:2075
 #, python-format
 msgid "Kicking %s"
 msgstr "Викидання %s"
 
-#: ../src/groupchat_control.py:2090 ../src/groupchat_control.py:2381
+#: ../src/groupchat_control.py:2076 ../src/groupchat_control.py:2367
 msgid "You may specify a reason below:"
 msgstr "Нижче ви можете зазначити причину:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2380
+#: ../src/groupchat_control.py:2366
 #, python-format
 msgid "Banning %s"
 msgstr "Блокування %s"
@@ -9124,48 +9082,47 @@
 msgid "- messages will not be logged"
 msgstr "- не вестиметься запис повідомлень"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:249
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змінив стан"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:259
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s в мережі"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:267
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s вийшов з мережі"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нове окреме повідомлення від %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:287
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Нове конфіденційне повідомлення з групової балачки %s"
 
-#: ../src/notify.py:270
+#: ../src/notify.py:289
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:273
+#: ../src/notify.py:292
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Повідомлення надіслано від імені %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:298
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Нове повідомлення від %(nickname)s"
 
-#: ../src/notify.py:534
-#, fuzzy
+#: ../src/notify.py:567
 msgid "Ignore"
 msgstr "_Ігнорувати"
 
@@ -9177,18 +9134,18 @@
 msgid "Retrieving profile..."
 msgstr "Отримання профілю..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2758
+#: ../src/profile_window.py:108 ../src/roster_window.py:2760
 msgid "File is empty"
 msgstr "Файл порожній"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2761
+#: ../src/profile_window.py:111 ../src/roster_window.py:2763
 msgid "File does not exist"
 msgstr "Файла не існує"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2763 ../src/roster_window.py:2774
+#: ../src/roster_window.py:2765 ../src/roster_window.py:2776
 msgid "Could not load image"
 msgstr "Не вдалося завантажити зображення"
 
@@ -9225,42 +9182,42 @@
 msgid "Merged accounts"
 msgstr "Об’єднані облікові записи"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1870
 msgid "Authorization has been sent"
 msgstr "Було надіслано уповноваження"
 
-#: ../src/roster_window.py:1875
+#: ../src/roster_window.py:1871
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Тепер «%s» буде відомий ваш стан."
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1891
 msgid "Subscription request has been sent"
 msgstr "Було надіслано запит на підписку"
 
-#: ../src/roster_window.py:1896
+#: ../src/roster_window.py:1892
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеся про його або її стан."
 
-#: ../src/roster_window.py:1908
+#: ../src/roster_window.py:1904
 msgid "Authorization has been removed"
 msgstr "Уповноваження було вилучено"
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1905
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Тепер «%s» завжди бачитиме вас як «поза мережею»."
 
-#: ../src/roster_window.py:1934
+#: ../src/roster_window.py:1930
 msgid "GPG is not usable"
 msgstr "GPG непридатне для використання"
 
-#: ../src/roster_window.py:2093 ../src/roster_window.py:3258
+#: ../src/roster_window.py:2094 ../src/roster_window.py:3260
 msgid "You are participating in one or more group chats"
 msgstr "Ви берете участь у одній або декількох групових балачках"
 
-#: ../src/roster_window.py:2094 ../src/roster_window.py:3259
+#: ../src/roster_window.py:2095 ../src/roster_window.py:3261
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9268,15 +9225,15 @@
 "Зміна стану на «невидимий» призведе до вашого виходу з наведених групових "
 "балачок. Ви справді бажаєте змінити стан на «невидимий»?"
 
-#: ../src/roster_window.py:2120
+#: ../src/roster_window.py:2121
 msgid "desync'ed"
 msgstr "розсинхронізація"
 
-#: ../src/roster_window.py:2258 ../src/roster_window.py:2495
+#: ../src/roster_window.py:2259 ../src/roster_window.py:2496
 msgid "You have unread messages"
 msgstr "У вас є непрочитані повідомлення"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2260
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9284,16 +9241,16 @@
 "Доступ для читання повідомлень буде можливим, лише якщо ви увімкнули журнал, "
 "а контакт наявний у вашому реєстрі."
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2497
 msgid "You must read them before removing this transport."
 msgstr "Вам слід прочитати їх, перш ніж вилучати цей транспорт."
 
-#: ../src/roster_window.py:2499
+#: ../src/roster_window.py:2500
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" буде вилучено"
 
-#: ../src/roster_window.py:2500
+#: ../src/roster_window.py:2501
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9301,11 +9258,11 @@
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цього транспорту."
 
-#: ../src/roster_window.py:2503
+#: ../src/roster_window.py:2504
 msgid "Transports will be removed"
 msgstr "Транспорти буде вилучено"
 
-#: ../src/roster_window.py:2508
+#: ../src/roster_window.py:2509
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9315,56 +9272,56 @@
 "допомогою цих транспортів: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2639
+#: ../src/roster_window.py:2640
 msgid "Rename Contact"
 msgstr "Перейменувати контакт"
 
-#: ../src/roster_window.py:2640
+#: ../src/roster_window.py:2641
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введіть новий псевдонім для контакту %s"
 
-#: ../src/roster_window.py:2647
+#: ../src/roster_window.py:2648
 msgid "Rename Group"
 msgstr "Перейменувати групу"
 
-#: ../src/roster_window.py:2648
+#: ../src/roster_window.py:2649
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введіть нову назву для групи %s"
 
-#: ../src/roster_window.py:2704
+#: ../src/roster_window.py:2706
 msgid "Remove Group"
 msgstr "Вилучити групу"
 
-#: ../src/roster_window.py:2705
+#: ../src/roster_window.py:2707
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Бажаєте вилучити групу %s з реєстру?"
 
-#: ../src/roster_window.py:2706
+#: ../src/roster_window.py:2708
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Крім того, вилучити всі контакти з цієї групи з вашого реєстру"
 
-#: ../src/roster_window.py:2745
+#: ../src/roster_window.py:2747
 msgid "Assign OpenPGP Key"
 msgstr "Призначити ключ OpenPGP"
 
-#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:2748
 msgid "Select a key to apply to the contact"
 msgstr "Оберіть ключ для використання з цим контактом"
 
-#: ../src/roster_window.py:3099
+#: ../src/roster_window.py:3101
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3101
+#: ../src/roster_window.py:3103
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
-msgstr ""
+msgstr "Ви збираєтесь вилучити \"%(name)s\" (%(jid)s) з вашого реєстру.\n"
 
-#: ../src/roster_window.py:3106
+#: ../src/roster_window.py:3108
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9373,11 +9330,11 @@
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3112
+#: ../src/roster_window.py:3114
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити виконання операції?"
 
-#: ../src/roster_window.py:3115
+#: ../src/roster_window.py:3117
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9385,16 +9342,16 @@
 "Вилучення цього контакту призведе до вилучення уповноваження, отже він або "
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
-#: ../src/roster_window.py:3118
+#: ../src/roster_window.py:3120
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, щоб цей контакт знав про мій стан після вилучення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3122
+#: ../src/roster_window.py:3124
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3127
+#: ../src/roster_window.py:3129
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9404,21 +9361,21 @@
 "призведе до вилучення уповноваження, отже для них ви завжди залишатиметеся "
 "поза мережею."
 
-#: ../src/roster_window.py:3182
+#: ../src/roster_window.py:3184
 msgid "No account available"
 msgstr "Немає жодного облікового запису"
 
-#: ../src/roster_window.py:3183
+#: ../src/roster_window.py:3185
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Перш ніж ви зможете розпочати балачку з контактами, вам слід створити "
 "обліковий запис."
 
-#: ../src/roster_window.py:3733
+#: ../src/roster_window.py:3735
 msgid "Metacontacts storage not supported by your server"
 msgstr "Збереження метаконтактів не підтримується вашим сервером"
 
-#: ../src/roster_window.py:3735
+#: ../src/roster_window.py:3737
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9426,12 +9383,12 @@
 "Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці "
 "відомості не буде збережено до наступного з’єднання."
 
-#: ../src/roster_window.py:3820
+#: ../src/roster_window.py:3822
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:3822
+#: ../src/roster_window.py:3824
 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 "
@@ -9441,11 +9398,11 @@
 "списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом "
 "є особа з декількома обліковими записами або транспортами Jabber."
 
-#: ../src/roster_window.py:3935
+#: ../src/roster_window.py:3937
 msgid "Invalid file URI:"
 msgstr "Некоректна адреса файла:"
 
-#: ../src/roster_window.py:3946
+#: ../src/roster_window.py:3948
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9458,123 +9415,123 @@
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4623 ../src/roster_window.py:4694
-#: ../src/roster_window.py:4703 ../src/systray.py:215 ../src/systray.py:262
+#: ../src/roster_window.py:4625 ../src/roster_window.py:4696
+#: ../src/roster_window.py:4705 ../src/systray.py:215 ../src/systray.py:262
 #: ../src/systray.py:268
 #, python-format
 msgid "using account %s"
 msgstr "з облікового запису %s"
 
 #. add
-#: ../src/roster_window.py:4710
+#: ../src/roster_window.py:4712
 #, python-format
 msgid "to %s account"
 msgstr "до облікового запису %s"
 
 #. disco
-#: ../src/roster_window.py:4715
+#: ../src/roster_window.py:4717
 #, python-format
 msgid "using %s account"
 msgstr "з облікового запису %s"
 
-#: ../src/roster_window.py:4752 ../src/systray.py:278
+#: ../src/roster_window.py:4754 ../src/systray.py:278
 msgid "_Manage Bookmarks..."
 msgstr "_Керування закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4772
+#: ../src/roster_window.py:4774
 #, python-format
 msgid "of account %s"
 msgstr "облікового запису %s"
 
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4814
 #, python-format
 msgid "for account %s"
 msgstr "до облікового запису %s"
 
-#: ../src/roster_window.py:4874 ../src/roster_window.py:4983
+#: ../src/roster_window.py:4876 ../src/roster_window.py:4985
 msgid "_Change Status Message"
 msgstr "_Змінити повідомлення про стан"
 
-#: ../src/roster_window.py:4901
+#: ../src/roster_window.py:4903
 msgid "Publish Tune"
 msgstr "Оприлюднити музику"
 
-#: ../src/roster_window.py:4908
+#: ../src/roster_window.py:4910
 msgid "Mood"
 msgstr "Настрій"
 
-#: ../src/roster_window.py:4912
+#: ../src/roster_window.py:4914
 msgid "Activity"
 msgstr "Заняття"
 
-#: ../src/roster_window.py:4917
+#: ../src/roster_window.py:4919
 msgid "Configure Services..."
 msgstr "Налаштувати служби..."
 
-#: ../src/roster_window.py:5071
+#: ../src/roster_window.py:5073
 msgid "_Maximize All"
 msgstr "_Максимізувати всі"
 
 #. Send Group Message
-#: ../src/roster_window.py:5079 ../src/roster_window.py:5605
+#: ../src/roster_window.py:5081 ../src/roster_window.py:5607
 msgid "Send Group M_essage"
 msgstr "Надіслати групове п_овідомлення"
 
-#: ../src/roster_window.py:5087
+#: ../src/roster_window.py:5089
 msgid "To all users"
 msgstr "Усім користувачам"
 
-#: ../src/roster_window.py:5091
+#: ../src/roster_window.py:5093
 msgid "To all online users"
 msgstr "Усім користувачам на зв'язку"
 
-#: ../src/roster_window.py:5502
+#: ../src/roster_window.py:5504
 msgid "I would like to add you to my roster"
 msgstr "Я хочу додати вас до свого реєстру"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5625
+#: ../src/roster_window.py:5627
 msgid "_Manage Contacts"
 msgstr "_Керування контактами"
 
 #. Send single message
-#: ../src/roster_window.py:5686
+#: ../src/roster_window.py:5688
 msgid "Send Single Message"
 msgstr "Надіслати окреме повідомлення"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5742
+#: ../src/roster_window.py:5744
 msgid "_Manage Transport"
 msgstr "_Керування транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5750
+#: ../src/roster_window.py:5752
 msgid "_Modify Transport"
 msgstr "_Змінити транспорт"
 
-#: ../src/roster_window.py:5824
+#: ../src/roster_window.py:5826
 msgid "_Maximize"
 msgstr "_Максимізувати"
 
-#: ../src/roster_window.py:5831
+#: ../src/roster_window.py:5833
 msgid "_Disconnect"
 msgstr "_Роз'єднати"
 
-#: ../src/roster_window.py:5911
+#: ../src/roster_window.py:5913
 msgid "_New Group Chat"
 msgstr "_Створити групову балачку"
 
 #. History manager
-#: ../src/roster_window.py:6024
+#: ../src/roster_window.py:6026
 msgid "History Manager"
 msgstr "Керування журналом"
 
-#: ../src/roster_window.py:6033
+#: ../src/roster_window.py:6035
 msgid "_Join New Group Chat"
 msgstr "_Приєднатись до нової групової балачки"
 
-#: ../src/roster_window.py:6243
+#: ../src/roster_window.py:6245
 msgid "Change Status Message..."
 msgstr "Змінити повідомлення про стан..."
 
@@ -9600,11 +9557,11 @@
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:403 ../src/session.py:438
+#: ../src/session.py:411 ../src/session.py:446
 msgid "Confirm these session options"
 msgstr "Підтвердити параметри цих сеансів"
 
-#: ../src/session.py:405
+#: ../src/session.py:413
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9619,7 +9576,7 @@
 "\n"
 "\tЧи всі вказані параметри є прийнятними?"
 
-#: ../src/session.py:439
+#: ../src/session.py:447
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9768,9 +9725,8 @@
 msgstr "Невідома"
 
 #: ../src/vcard.py:269
-#, fuzzy
 msgid "?Time:Unknown"
-msgstr "Невідомий"
+msgstr "?Час:Невідомий"
 
 #: ../src/vcard.py:293 ../src/vcard.py:303 ../src/vcard.py:524
 #, python-format
@@ -9823,6 +9779,18 @@
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
+#~ msgid "Your JID:"
+#~ msgstr "Ваш JID:"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Повторне використання Jabber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Такий обліковий запис вже було налаштовано у Gajim."
+
+#~ msgid "%s is not a valid loglevel"
+#~ msgstr "%s не є коректним рівнем журналювання"
+
 #~ msgid "Name:"
 #~ msgstr "Назва:"
 

Modified: branches/osx_newbuildsys/src/advanced.py
===================================================================
--- branches/osx_newbuildsys/src/advanced.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/advanced.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -267,9 +267,19 @@
 				self.model.append(parent, [name, value, type_])
 
 	def visible_func(self, model, treeiter):
-		search_string  = self.entry.get_text()
-		return any(search_string in model[it][C_PREFNAME] for it in
-			tree_model_pre_order(model, treeiter) if model[it][C_TYPE] != '')
+		search_string  = self.entry.get_text().lower()
+		for it in tree_model_pre_order(model,treeiter): 
+			if model[it][C_TYPE] != '': 
+				opt_path = self.get_option_path(model, it) 
+				if len(opt_path) == 3: 
+					desc = gajim.config.get_desc_per(opt_path[2], opt_path[1], 
+						opt_path[0]) 
+				elif len(opt_path) == 1: 
+					desc = gajim.config.get_desc(opt_path[0]) 
+				if search_string in model[it][C_PREFNAME] or (desc and \
+				search_string in desc.lower()):
+					return True
+		return False
 
 	@rate_limit(3)
 	def on_advanced_entry_changed(self, widget):

Modified: branches/osx_newbuildsys/src/chat_control.py
===================================================================
--- branches/osx_newbuildsys/src/chat_control.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/chat_control.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -57,8 +57,6 @@
 except ImportError:
 	HAS_GTK_SPELL = False
 
-HAVE_MARKUP_TOOLTIPS = gtk.pygtk_version >= (2, 12, 0)
-
 # the next script, executed in the "po" directory,
 # generates the following list.
 ##!/bin/sh
@@ -181,6 +179,8 @@
 			self.banner_status_label = gtk.Label()
 		self.banner_status_label.set_selectable(True)
 		self.banner_status_label.set_alignment(0,0.5)
+		self.banner_status_label.connect('populate_popup',
+			self.on_banner_label_populate_popup)
 
 		banner_vbox = self.xml.get_widget('banner_vbox')
 		banner_vbox.pack_start(self.banner_status_label)
@@ -200,6 +200,8 @@
 
 		# Create textviews and connect signals
 		self.conv_textview = ConversationTextview(self.account)
+		id_ = self.conv_textview.connect('quote', self.on_quote)
+		self.handlers[id_] = self.conv_textview.tv
 		id_ = self.conv_textview.tv.connect('key_press_event',
 			self._conv_textview_key_press_event)
 		self.handlers[id_] = self.conv_textview.tv
@@ -317,6 +319,20 @@
 		except (gobject.GError, RuntimeError, TypeError, OSError):
 			dialogs.AspellDictError(lang)
 
+	def on_banner_label_populate_popup(self, label, menu):
+		'''We override the default context menu and add our own menutiems'''
+		item = gtk.SeparatorMenuItem()
+		menu.prepend(item)
+
+		menu2 = self.prepare_context_menu()
+		i = 0
+		for item in menu2:
+			menu2.remove(item)
+			menu.prepend(item)
+			menu.reorder_child(item, i)
+			i += 1
+		menu.show_all()
+
 	def on_msg_textview_populate_popup(self, textview, menu):
 		'''we override the default context menu and we prepend an option to switch
 		languages'''
@@ -356,6 +372,11 @@
 
 		menu.show_all()
 
+	def on_quote(self, widget, text):
+		text = '>' + text.replace('\n', '\n>') + '\n'
+		message_buffer = self.msg_textview.get_buffer()
+		message_buffer.insert_at_cursor(text)
+
 	# moved from ChatControl
 	def _on_banner_eventbox_button_press_event(self, widget, event):
 		'''If right-clicked, show popup'''
@@ -437,8 +458,6 @@
 		self.connect_style_event(widget, opts[0], opts[1])
 
 	def _conv_textview_key_press_event(self, widget, event):
-		if gtk.gtk_version < (2, 12, 0):
-			return
 		if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (gtk.keysyms.c,
 		gtk.keysyms.Insert)) or (event.state & gtk.gdk.SHIFT_MASK and \
 		event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)):
@@ -836,6 +855,34 @@
 			gajim.interface.instances['logs'] = \
 				history_window.HistoryWindow(jid, self.account)
 
+	def _on_send_file(self, gc_contact=None):
+		'''gc_contact can be set when we are in a groupchat control'''
+		def _on_ok(c):
+			gajim.interface.instances['file_transfers'].show_file_send_request(
+				self.account, c)
+		if self.TYPE_ID == message_control.TYPE_PM:
+			gc_contact = self.gc_contact
+		if gc_contact:
+			# gc or pm
+			gc_control = gajim.interface.msg_win_mgr.get_gc_control(
+				gc_contact.room_jid, self.account)
+			self_contact = gajim.contacts.get_gc_contact(self.account,
+				gc_control.room_jid, gc_control.nick)
+			if gc_control.is_anonymous and gc_contact.affiliation not in ['admin',
+			'owner'] and self_contact.affiliation in ['admin', 'owner']:
+				contact = gajim.contacts.get_contact(self.account, gc_contact.jid)
+				if not contact or contact.sub not in ('both', 'to'):
+					prim_text = _('Really send file?')
+					sec_text = _('If you send a file to %s, he/she will know your '
+						'real Jabber ID.') % gc_contact.name
+					dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text,
+						on_response_ok = (_on_ok, gc_contact))
+					dialog.popup()
+					return
+			_on_ok(gc_contact)
+			return
+		_on_ok(self.contact)
+
 	def on_minimize_menuitem_toggled(self, widget):
 		'''When a grouchat is minimized, unparent the tab, put it in roster etc'''
 		old_value = False
@@ -1144,11 +1191,6 @@
 		self._activity_image = self.xml.get_widget('activity_image')
 		self._tune_image = self.xml.get_widget('tune_image')
 
-		if not HAVE_MARKUP_TOOLTIPS:
-			self._mood_tooltip = gtk.Tooltips()
-			self._activity_tooltip = gtk.Tooltips()
-			self._tune_tooltip = gtk.Tooltips()
-
 		self.update_mood()
 		self.update_activity()
 		self.update_tune()
@@ -1258,6 +1300,13 @@
 			self._send_file_button.set_sensitive(True)
 		else:
 			self._send_file_button.set_sensitive(False)
+			if not gajim.capscache.is_supported(self.contact, NS_FILE):
+				self._send_file_button.set_tooltip_text(_(
+					"This contact does not support file transfer."))
+			else:
+				self._send_file_button.set_tooltip_text(
+					_("You need to know the real JID of the contact to send him or "
+					"her a file."))
 
 		# Convert to GC
 		if gajim.capscache.is_supported(self.contact, NS_MUC):
@@ -1287,19 +1336,13 @@
 				self._mood_image.set_from_pixbuf(gtkgui_helpers.load_mood_icon(
 					'unknown').get_pixbuf())
 
-			if HAVE_MARKUP_TOOLTIPS:
-				mood = gobject.markup_escape_text(mood)
+			mood = gobject.markup_escape_text(mood)
 
-				tooltip = '<b>%s</b>' % mood
-				if text:
-					text = gobject.markup_escape_text(text)
-					tooltip += '\n' + text
-				self._mood_image.set_tooltip_markup(tooltip)
-			else:
-				tooltip = mood
-				if text:
-					tooltip += '\n' + text
-				self._mood_tooltip.set_tip(self._mood_image, tooltip)
+			tooltip = '<b>%s</b>' % mood
+			if text:
+				text = gobject.markup_escape_text(text)
+				tooltip += '\n' + text
+			self._mood_image.set_tooltip_markup(tooltip)
 			self._mood_image.show()
 		else:
 			self._mood_image.hide()
@@ -1337,21 +1380,13 @@
 
 			# Translate standard subactivities
 
-			if HAVE_MARKUP_TOOLTIPS:
-				tooltip = '<b>' + gobject.markup_escape_text(activity)
-				if subactivity:
-					tooltip += ': ' + gobject.markup_escape_text(subactivity)
-				tooltip += '</b>'
-				if text:
-					tooltip += '\n' + gobject.markup_escape_text(text)
-				self._activity_image.set_tooltip_markup(tooltip)
-			else:
-				tooltip = activity
-				if subactivity:
-					tooltip += ': ' + subactivity
-				if text:
-					tooltip += '\n' + text
-				self._activity_tooltip.set_tip(self._activity_image, tooltip)
+			tooltip = '<b>' + gobject.markup_escape_text(activity)
+			if subactivity:
+				tooltip += ': ' + gobject.markup_escape_text(subactivity)
+			tooltip += '</b>'
+			if text:
+				tooltip += '\n' + gobject.markup_escape_text(text)
+			self._activity_image.set_tooltip_markup(tooltip)
 
 			self._activity_image.show()
 		else:
@@ -1367,16 +1402,13 @@
 
 		if 'artist' in self.contact.tune:
 			artist = self.contact.tune['artist'].strip()
-			if HAVE_MARKUP_TOOLTIPS:
-				artist = gobject.markup_escape_text(artist)
+			artist = gobject.markup_escape_text(artist)
 		if 'title' in self.contact.tune:
 			title = self.contact.tune['title'].strip()
-			if HAVE_MARKUP_TOOLTIPS:
-				title = gobject.markup_escape_text(title)
+			title = gobject.markup_escape_text(title)
 		if 'source' in self.contact.tune:
 			source = self.contact.tune['source'].strip()
-			if HAVE_MARKUP_TOOLTIPS:
-				source = gobject.markup_escape_text(source)
+			source = gobject.markup_escape_text(source)
 
 		if artist or title:
 			if not artist:
@@ -1386,15 +1418,10 @@
 			if not source:
 				source = _('Unknown Source')
 
-			if HAVE_MARKUP_TOOLTIPS:
-				self._tune_image.set_tooltip_markup(
-					_('<b>"%(title)s"</b> by <i>%(artist)s</i>\n'
-					'from <i>%(source)s</i>') % {'title': title, 'artist': artist,
-					'source': source})
-			else:
-				self._tune_tooltip.set_tip(self._tune_image,
-					_('%(title)s by %(artist)s\nfrom %(source)s') % {'title': title,
-					'artist': artist, 'source': source})
+			self._tune_image.set_tooltip_markup(
+				_('<b>"%(title)s"</b> by <i>%(artist)s</i>\n'
+				'from <i>%(source)s</i>') % {'title': title, 'artist': artist,
+				'source': source})
 			self._tune_image.show()
 		else:
 			self._tune_image.hide()
@@ -2170,10 +2197,14 @@
 	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)
+		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()
 
@@ -2299,6 +2330,12 @@
 		self.conv_textview.del_handlers()
 		self.msg_textview.destroy()
 
+	def minimizable(self):
+		return False
+
+	def safe_shutdown(self):
+		return False
+
 	def allow_shutdown(self, method, on_yes, on_no, on_minimize):
 		if time.time() - gajim.last_message_time[self.account]\
 		[self.get_full_jid()] < 2:
@@ -2595,8 +2632,7 @@
 		# so this line adds that
 		window.set_events(gtk.gdk.POINTER_MOTION_MASK)
 		window.set_app_paintable(True)
-		if gtk.gtk_version >= (2, 10, 0) and gtk.pygtk_version >= (2, 10, 0):
-			window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP)
+		window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP)
 
 		window.realize()
 		window.window.set_back_pixmap(pixmap, False) # make it transparent
@@ -2635,12 +2671,7 @@
 		self.bigger_avatar_window.window.set_cursor(cursor)
 
 	def _on_send_file_menuitem_activate(self, widget):
-		if self.TYPE_ID == message_control.TYPE_PM:
-			c = self.gc_contact
-		else:
-			c = self.contact
-		gajim.interface.instances['file_transfers'].show_file_send_request(
-			self.account, c)
+		self._on_send_file()
 
 	def _on_add_to_roster_menuitem_activate(self, widget):
 		dialogs.AddNewContactWindow(self.account, self.contact.jid)

Modified: branches/osx_newbuildsys/src/common/caps.py
===================================================================
--- branches/osx_newbuildsys/src/common/caps.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/caps.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -229,7 +229,11 @@
 		# for disco... so that disco will learn how to interpret
 		# these caps
 		pm_ctrl = None
-		jid = helpers.get_full_jid_from_iq(presence)
+		try:
+			jid = helpers.get_full_jid_from_iq(presence)
+		except:
+			# Bad jid
+			return
 		contact = gajim.contacts.get_contact_from_full_jid(self.name, jid)
 		if contact is None:
 			room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)

Modified: branches/osx_newbuildsys/src/common/config.py
===================================================================
--- branches/osx_newbuildsys/src/common/config.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/config.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -190,6 +190,7 @@
 		'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')],
 		'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chat jids.')],
 		'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask before closing group chat tab/window in this space separated list of group chat jids.')],
+		'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are control that can loose data (chat, private chat, groupchat that will not be minimized)')],
 		'notify_on_file_complete': [opt_bool, True],
 		'file_transfers_port': [opt_int, 28011],
 		'ft_add_hosts_to_send': [opt_str, '', _('Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding.')],
@@ -269,6 +270,7 @@
 		'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')],
 		'latex_png_dpi': [opt_str, '108',_('Change the value to change the size of latex formulas displayed. The higher is larger.') ],
 		'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!') ],
 	}
 
 	__options_per_key = {
@@ -348,6 +350,11 @@
 		}, {}),
 		'statusmsg': ({
 			'message': [ opt_str, '' ],
+			'activity': [ opt_str, '' ],
+			'subactivity': [ opt_str, '' ],
+			'activity_text': [ opt_str, '' ],
+			'mood': [ opt_str, '' ],
+			'mood_text': [ opt_str, '' ],
 		}, {}),
 		'defaultstatusmsg': ({
 			'enabled': [ opt_bool, False ],
@@ -428,13 +435,13 @@
 	}
 
 	statusmsg_default = {
-		_('Sleeping'): 'ZZZZzzzzzZZZZZ',
-		_('Back soon'): _('Back in some minutes.'),
-		_('Eating'): _("I'm eating, so leave me a message."),
-		_('Movie'): _("I'm watching a movie."),
-		_('Working'): _("I'm working."),
-		_('Phone'): _("I'm on the phone."),
-		_('Out'): _("I'm out enjoying life."),
+		_('Sleeping'): [ 'ZZZZzzzzzZZZZZ', 'inactive', 'sleeping', '', 'sleepy', '' ],
+		_('Back soon'): [ _('Back in some minutes.'), '', '', '', '', '' ],
+		_('Eating'): [ _("I'm eating, so leave me a message."), 'eating', 'other', '', '', '' ],
+		_('Movie'): [ _("I'm watching a movie."), 'relaxing', 'watching_a_movie', '', '', '' ],
+		_('Working'): [ _("I'm working."), 'working', 'other', '', '', '' ],
+		_('Phone'): [ _("I'm on the phone."), 'talking', 'on_the_phone', '', '', '' ],
+		_('Out'): [ _("I'm out enjoying life."), 'relaxing', 'going_out', '', '', '' ],
 	}
 
 	defaultstatusmsg_default = {

Modified: branches/osx_newbuildsys/src/common/connection.py
===================================================================
--- branches/osx_newbuildsys/src/common/connection.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/connection.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -156,6 +156,7 @@
 		self.blocked_groups = []
 		self.blocked_all = False
 		self.music_track_info = 0
+		self.pubsub_supported = False
 		self.pep_supported = False
 		self.mood = {}
 		self.tune = {}
@@ -1661,7 +1662,7 @@
 				resp.getTag('unique').getData()))
 		self.connection.SendAndCallForResponse(iq, _on_response)
 
-	def join_gc(self, nick, room_jid, password):
+	def join_gc(self, nick, room_jid, password, change_nick=False):
 		# FIXME: This room JID needs to be normalized; see #1364
 		if not self.connection:
 			return
@@ -1674,7 +1675,8 @@
 		if gajim.config.get('send_sha_in_gc_presence'):
 			p = self.add_sha(p)
 		self.add_lang(p)
-		t = p.setTag(common.xmpp.NS_MUC + ' x')
+		if not change_nick:
+			t = p.setTag(common.xmpp.NS_MUC + ' x')
 		if password:
 			t.setTagData('password', password)
 		self.connection.send(p)

Modified: branches/osx_newbuildsys/src/common/connection_handlers.py
===================================================================
--- branches/osx_newbuildsys/src/common/connection_handlers.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/connection_handlers.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -112,13 +112,13 @@
 		for file_props in self.files_props.values():
 			if self.is_transfer_stopped(file_props):
 				continue
-			receiver_jid = unicode(file_props['receiver']).split('/')[0]
-			if contact.jid == receiver_jid:
+			receiver_jid = unicode(file_props['receiver'])
+			if contact.get_full_jid() == receiver_jid:
 				file_props['error'] = -5
 				self.remove_transfer(file_props)
 				self.dispatch('FILE_REQUEST_ERROR', (contact.jid, file_props, ''))
-			sender_jid = unicode(file_props['sender']).split('/')[0]
-			if contact.jid == sender_jid:
+			sender_jid = unicode(file_props['sender'])
+			if contact.get_full_jid() == sender_jid:
 				file_props['error'] = -3
 				self.remove_transfer(file_props)
 
@@ -885,6 +885,8 @@
 								gajim.interface.roster.music_track_changed(listener,
 										track, self.name)
 						break
+			if features.__contains__(common.xmpp.NS_PUBSUB):
+				self.pubsub_supported = True
 			if features.__contains__(common.xmpp.NS_BYTESTREAM):
 				our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) +\
 					'/' + self.server_resource)
@@ -1549,9 +1551,8 @@
 			self.dispatch('ROSTER_INFO', (jid, name, sub, ask, groups))
 		if not self.connection or self.connected < 2:
 			raise common.xmpp.NodeProcessed
-		server = gajim.config.get_per('accounts', self.name, 'hostname')
 		reply = common.xmpp.Iq(typ='result', attrs={'id': iq_obj.getID()},
-			to=server, frm=iq_obj.getTo(), xmlns=None)
+			to=iq_obj.getFrom(), frm=iq_obj.getTo(), xmlns=None)
 		self.connection.send(reply)
 		raise common.xmpp.NodeProcessed
 
@@ -2074,7 +2075,7 @@
 		try:
 			who = helpers.get_full_jid_from_iq(prs)
 		except Exception:
-			if prs.getTag('error').getTag('jid-malformed'):
+			if prs.getTag('error') and prs.getTag('error').getTag('jid-malformed'):
 				# wrong jid, we probably tried to change our nick in a room to a non
 				# valid one
 				who = str(prs.getFrom())

Modified: branches/osx_newbuildsys/src/common/contacts.py
===================================================================
--- branches/osx_newbuildsys/src/common/contacts.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/contacts.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -576,9 +576,9 @@
 	def contact_from_gc_contact(self, gc_contact):
 		'''Create a Contact instance from a GC_Contact instance'''
 		jid = gc_contact.get_full_jid()
-		return Contact(jid=jid, resource='', name=gc_contact.name, groups=[],
-			show=gc_contact.show, status=gc_contact.status, sub='none',
-			caps_node=gc_contact.caps_node,
+		return Contact(jid=jid, resource=gc_contact.resource,
+			name=gc_contact.name, groups=[], show=gc_contact.show,
+			status=gc_contact.status, sub='none', caps_node=gc_contact.caps_node,
 			caps_hash_method=gc_contact.caps_hash_method,
 			caps_hash=gc_contact.caps_hash)
 

Modified: branches/osx_newbuildsys/src/common/defs.py
===================================================================
--- branches/osx_newbuildsys/src/common/defs.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/defs.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -27,7 +27,7 @@
 datadir = '../'
 localedir = '../po'
 
-version = '0.12.1.2-svn'
+version = '0.12.1.3-svn'
 
 import sys, os.path
 for base in ('.', 'common'):

Modified: branches/osx_newbuildsys/src/common/helpers.py
===================================================================
--- branches/osx_newbuildsys/src/common/helpers.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/helpers.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -643,6 +643,7 @@
 # import gajim only when needed (after decode_string is defined) see #4764
 
 import gajim
+import pep
 
 def convert_bytes(string):
 	suffix = ''
@@ -801,7 +802,7 @@
 	maxi = 0
 	for account in gajim.connections:
 		if not gajim.config.get_per('accounts', account,
-			'sync_with_global_status'):
+		'sync_with_global_status'):
 			continue
 		connected = gajim.connections[account].connected
 		if connected > maxi:
@@ -812,7 +813,7 @@
 	maxi = 0
 	for account in gajim.connections:
 		if not gajim.config.get_per('accounts', account,
-			'sync_with_global_status'):
+		'sync_with_global_status'):
 			continue
 		connected = gajim.connections[account].connected
 		if connected > maxi:
@@ -820,6 +821,54 @@
 			status = gajim.connections[account].status
 	return status
 
+def get_pep_dict(account):
+	pep_dict = {}
+	con = gajim.connections[account]
+	# activity
+	if 'activity' in con.activity and con.activity['activity'] in pep.ACTIVITIES:
+		activity = con.activity['activity']
+		if 'subactivity' in con.activity and con.activity['subactivity'] in \
+		pep.ACTIVITIES[activity]:
+			subactivity = con.activity['subactivity']
+		else:
+			subactivity = 'other'
+	else:
+		activity = ''
+		subactivity = ''
+	if 'text' in con.activity:
+		text = con.activity['text']
+	else:
+		text = ''
+	pep_dict['activity'] = activity
+	pep_dict['subactivity'] = subactivity
+	pep_dict['activity_text'] = text
+
+	# mood
+	if 'mood' in con.mood and con.mood['mood'] in pep.MOODS:
+		mood = con.mood['mood']
+	else:
+		mood = ''
+	if 'text' in con.mood:
+		text = con.mood['text']
+	else:
+		text = ''
+	pep_dict['mood'] = mood
+	pep_dict['mood_text'] = text
+	return pep_dict
+
+def get_global_pep():
+	maxi = 0
+	pep_dict = {'activity': '', 'mood': ''}
+	for account in gajim.connections:
+		if not gajim.config.get_per('accounts', account,
+		'sync_with_global_status'):
+			continue
+		connected = gajim.connections[account].connected
+		if connected > maxi:
+			maxi = connected
+			pep_dict = get_pep_dict(account)
+	return pep_dict
+
 def statuses_unified():
 	'''testing if all statuses are the same.'''
 	reference = None

Modified: branches/osx_newbuildsys/src/common/logger.py
===================================================================
--- branches/osx_newbuildsys/src/common/logger.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/logger.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -586,8 +586,12 @@
 		seconds_in_a_day = 86400 # 60 * 60 * 24
 		last_second_of_month = start_of_month + (seconds_in_a_day * max_day) - 1
 
+		# Select times and 'floor' them to time 0:00
+		# (by dividing, they are integers)
+		# and take only one of the same values (distinct)
+		# Now we have timestamps of time 0:00 of every day with logs
 		self.cur.execute('''
-			SELECT time FROM logs
+			SELECT DISTINCT time/(86400)*86400 FROM logs
 			WHERE (%s)
 			AND time BETWEEN %d AND %d
 			AND kind NOT IN (%d, %d)
@@ -596,34 +600,10 @@
 			constants.KIND_STATUS, constants.KIND_GCSTATUS))
 		result = self.cur.fetchall()
 
-		# Copy all interesting times in a temporary table
-		try:
-			self.cur.execute('CREATE TEMPORARY TABLE temp_table(time,INTEGER)')
-		except sqlite.OperationalError, e:
-			raise exceptions.PysqliteOperationalError(str(e))
+		# convert timestamps to day of month
 		for line in result:
-			self.cur.execute('''
-				INSERT INTO temp_table (time) VALUES (%d)
-				''' % (line[0]))
+			days_with_logs[0:0]=[time.gmtime(line[0])[2]]
 
-		# then search in this small temp table for each day
-		for day in xrange(1, max_day + 1):  # count from 1 to 28 or to 30 or to 31
-			start_of_day = self.get_unix_time_from_date(year, month, day)
-			last_second_of_day = start_of_day + seconds_in_a_day - 1
-
-			# just ask one row to see if we have sth for this date
-			self.cur.execute('''
-				SELECT time FROM temp_table
-				WHERE time BETWEEN %d AND %d
-				LIMIT 1
-				''' % (start_of_day, last_second_of_day))
-			result = self.cur.fetchone()
-			if result:
-				days_with_logs[0:0]=[day]
-
-		# Delete temporary table
-		self.cur.execute('DROP TABLE temp_table')
-		result = self.cur.fetchone()
 		return days_with_logs
 
 	def get_last_date_that_has_logs(self, jid, account = None, is_room = False):

Modified: branches/osx_newbuildsys/src/common/optparser.py
===================================================================
--- branches/osx_newbuildsys/src/common/optparser.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/optparser.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -191,6 +191,8 @@
 			self.update_config_to_01211()
 		if old < [0, 12, 1, 2] and new >= [0, 12, 1, 2]:
 			self.update_config_to_01212()
+		if old < [0, 12, 1, 3] and new >= [0, 12, 1, 3]:
+			self.update_config_to_01213()
 
 		gajim.logger.init_vars()
 		gajim.config.set('version', new_version)
@@ -629,4 +631,20 @@
 					gajim.config.set_per('accounts', account, opt, val)
 		gajim.config.set('version', '0.12.1.2')
 
+	def update_config_to_01213(self):
+		msgs = gajim.config.statusmsg_default
+		for msg_name in gajim.config.get_per('statusmsg'):
+			if msg_name in msgs:
+				gajim.config.set_per('statusmsg', msg_name, 'activity',
+					msgs[msg_name][1])
+				gajim.config.set_per('statusmsg', msg_name, 'subactivity',
+					msgs[msg_name][2])
+				gajim.config.set_per('statusmsg', msg_name, 'activity_text',
+					msgs[msg_name][3])
+				gajim.config.set_per('statusmsg', msg_name, 'mood',
+					msgs[msg_name][4])
+				gajim.config.set_per('statusmsg', msg_name, 'mood_text',
+					msgs[msg_name][5])
+		gajim.config.set('version', '0.12.1.3')
+
 # vim: se ts=3:

Modified: branches/osx_newbuildsys/src/common/pep.py
===================================================================
--- branches/osx_newbuildsys/src/common/pep.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/pep.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -5,7 +5,7 @@
 ## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org>
 ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com>
 ##                    Jean-Marie Traissard <jim AT lapin.org>
-##                    Jonathan Schleifer <js-gajim AT webkeks.org>
+##                    Jonathan Schleifer <js-common.gajim AT webkeks.org>
 ##                    Stephan Erb <steve-e AT h3c.de>
 ##
 ## This file is part of Gajim.
@@ -23,7 +23,8 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-from common import gajim, xmpp
+import common.gajim
+from common import xmpp
 
 MOODS = {
 	'afraid':			_('Afraid'),
@@ -208,8 +209,8 @@
 	if items.getTag('retract') is not None:
 		retract = True
 
-	if jid == gajim.get_jid_from_account(name):
-		acc = gajim.connections[name]
+	if jid == common.gajim.get_jid_from_account(name):
+		acc = common.gajim.connections[name]
 		if has_child:
 			if 'mood' in acc.mood:
 				del acc.mood['mood']
@@ -225,8 +226,8 @@
 			if 'text' in acc.mood:
 				del acc.mood['text']
 
-	(user, resource) = gajim.get_room_and_nick_from_fjid(jid)
-	for contact in gajim.contacts.get_contacts(name, user):
+	(user, resource) = common.gajim.get_room_and_nick_from_fjid(jid)
+	for contact in common.gajim.contacts.get_contacts(name, user):
 		if has_child:
 			if 'mood' in contact.mood:
 				del contact.mood['mood']
@@ -242,10 +243,10 @@
 			if 'text' in contact.mood:
 				del contact.mood['text']
 
-	if jid == gajim.get_jid_from_account(name):
-		gajim.interface.roster.draw_account(name)
-	gajim.interface.roster.draw_mood(user, name)
-	ctrl = gajim.interface.msg_win_mgr.get_control(user, name)
+	if jid == common.gajim.get_jid_from_account(name):
+		common.gajim.interface.roster.draw_account(name)
+	common.gajim.interface.roster.draw_mood(user, name)
+	ctrl = common.gajim.interface.msg_win_mgr.get_control(user, name)
 	if ctrl:
 		ctrl.update_mood()
 
@@ -276,8 +277,8 @@
 	if items.getTag('retract') is not None:
 		retract = True
 
-	if jid == gajim.get_jid_from_account(name):
-		acc = gajim.connections[name]
+	if jid == common.gajim.get_jid_from_account(name):
+		acc = common.gajim.connections[name]
 		if has_child:
 			if 'artist' in acc.tune:
 				del acc.tune['artist']
@@ -311,8 +312,8 @@
 			if 'length' in acc.tune:
 				del acc.tune['length']
 
-	user = gajim.get_room_and_nick_from_fjid(jid)[0]
-	for contact in gajim.contacts.get_contacts(name, user):
+	user = common.gajim.get_room_and_nick_from_fjid(jid)[0]
+	for contact in common.gajim.contacts.get_contacts(name, user):
 		if has_child:
 			if 'artist' in contact.tune:
 				del contact.tune['artist']
@@ -346,10 +347,10 @@
 			if 'length' in contact.tune:
 				del contact.tune['length']
 
-	if jid == gajim.get_jid_from_account(name):
-		gajim.interface.roster.draw_account(name)
-	gajim.interface.roster.draw_tune(user, name)
-	ctrl = gajim.interface.msg_win_mgr.get_control(user, name)
+	if jid == common.gajim.get_jid_from_account(name):
+		common.gajim.interface.roster.draw_account(name)
+	common.gajim.interface.roster.draw_tune(user, name)
+	ctrl = common.gajim.interface.msg_win_mgr.get_control(user, name)
 	if ctrl:
 		ctrl.update_tune()
 
@@ -377,8 +378,8 @@
 	if items.getTag('retract') is not None:
 		retract = True
 
-	if jid == gajim.get_jid_from_account(name):
-		acc = gajim.connections[name]
+	if jid == common.gajim.get_jid_from_account(name):
+		acc = common.gajim.connections[name]
 		if has_child:
 			if 'activity' in acc.activity:
 				del acc.activity['activity']
@@ -400,8 +401,8 @@
 			if 'text' in acc.activity:
 				del acc.activity['text']
 
-	user = gajim.get_room_and_nick_from_fjid(jid)[0]
-	for contact in gajim.contacts.get_contacts(name, user):
+	user = common.gajim.get_room_and_nick_from_fjid(jid)[0]
+	for contact in common.gajim.contacts.get_contacts(name, user):
 		if has_child:
 			if 'activity' in contact.activity:
 				del contact.activity['activity']
@@ -423,10 +424,10 @@
 			if 'text' in contact.activity:
 				del contact.activity['text']
 
-	if jid == gajim.get_jid_from_account(name):
-		gajim.interface.roster.draw_account(name)
-	gajim.interface.roster.draw_activity(user, name)
-	ctrl = gajim.interface.msg_win_mgr.get_control(user, name)
+	if jid == common.gajim.get_jid_from_account(name):
+		common.gajim.interface.roster.draw_account(name)
+	common.gajim.interface.roster.draw_activity(user, name)
+	ctrl = common.gajim.interface.msg_win_mgr.get_control(user, name)
 	if ctrl:
 		ctrl.update_activity()
 
@@ -445,21 +446,21 @@
 	if items.getTag('retract') is not None:
 		retract = True
 
-	if jid == gajim.get_jid_from_account(name):
+	if jid == common.gajim.get_jid_from_account(name):
 		if has_child:
-			gajim.nicks[name] = nick
+			common.gajim.nicks[name] = nick
 		if retract:
-			gajim.nicks[name] = gajim.config.get_per('accounts',
+			common.gajim.nicks[name] = common.gajim.config.get_per('accounts',
 				name, 'name')
 
-	user = gajim.get_room_and_nick_from_fjid(jid)[0]
+	user = common.gajim.get_room_and_nick_from_fjid(jid)[0]
 	if has_child:
 		if nick is not None:
-			for contact in gajim.contacts.get_contacts(name, user):
+			for contact in common.gajim.contacts.get_contacts(name, user):
 				contact.contact_name = nick
-			gajim.interface.roster.draw_contact(user, name)
+			common.gajim.interface.roster.draw_contact(user, name)
 
-			ctrl = gajim.interface.msg_win_mgr.get_control(user, name)
+			ctrl = common.gajim.interface.msg_win_mgr.get_control(user, name)
 			if ctrl:
 				ctrl.update_ui()
 				win = ctrl.parent_win
@@ -469,7 +470,7 @@
 		contact.contact_name = ''
 
 def user_send_mood(account, mood, message=''):
-	if not gajim.connections[account].pep_supported:
+	if not common.gajim.connections[account].pep_supported:
 		return
 	item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD})
 	if mood != '':
@@ -478,10 +479,11 @@
 		i = item.addChild('text')
 		i.addData(message)
 
-	gajim.connections[account].send_pb_publish('', xmpp.NS_MOOD, item, '0')
+	common.gajim.connections[account].send_pb_publish('', xmpp.NS_MOOD, item,
+		'0')
 
 def user_send_activity(account, activity, subactivity='', message=''):
-	if not gajim.connections[account].pep_supported:
+	if not common.gajim.connections[account].pep_supported:
 		return
 	item = xmpp.Node('activity', {'xmlns': xmpp.NS_ACTIVITY})
 	if activity != '':
@@ -492,12 +494,13 @@
 		i = item.addChild('text')
 		i.addData(message)
 
-	gajim.connections[account].send_pb_publish('', xmpp.NS_ACTIVITY, item, '0')
+	common.gajim.connections[account].send_pb_publish('', xmpp.NS_ACTIVITY, item,
+		'0')
 
 def user_send_tune(account, artist='', title='', source='', track=0, length=0,
 items=None):
-	if not (gajim.config.get_per('accounts', account, 'publish_tune') and \
-	gajim.connections[account].pep_supported):
+	if not (common.gajim.config.get_per('accounts', account, 'publish_tune') and\
+	common.gajim.connections[account].pep_supported):
 		return
 	item = xmpp.Node('tune', {'xmlns': xmpp.NS_TUNE})
 	if artist != '':
@@ -518,33 +521,35 @@
 	if items is not None:
 		item.addChild(payload=items)
 
-	gajim.connections[account].send_pb_publish('', xmpp.NS_TUNE, item, '0')
+	common.gajim.connections[account].send_pb_publish('', xmpp.NS_TUNE, item,
+		'0')
 
 def user_send_nickname(account, nick):
-	if not gajim.connections[account].pep_supported:
+	if not common.gajim.connections[account].pep_supported:
 		return
 	item = xmpp.Node('nick', {'xmlns': xmpp.NS_NICK})
 	item.addData(nick)
 
-	gajim.connections[account].send_pb_publish('', xmpp.NS_NICK, item, '0')
+	common.gajim.connections[account].send_pb_publish('', xmpp.NS_NICK, item,
+		'0')
 
 def user_retract_mood(account):
-	gajim.connections[account].send_pb_retract('', xmpp.NS_MOOD, '0')
+	common.gajim.connections[account].send_pb_retract('', xmpp.NS_MOOD, '0')
 
 def user_retract_activity(account):
-	gajim.connections[account].send_pb_retract('', xmpp.NS_ACTIVITY, '0')
+	common.gajim.connections[account].send_pb_retract('', xmpp.NS_ACTIVITY, '0')
 
 def user_retract_tune(account):
-	gajim.connections[account].send_pb_retract('', xmpp.NS_TUNE, '0')
+	common.gajim.connections[account].send_pb_retract('', xmpp.NS_TUNE, '0')
 
 def user_retract_nickname(account):
-	gajim.connections[account].send_pb_retract('', xmpp.NS_NICK, '0')
+	common.gajim.connections[account].send_pb_retract('', xmpp.NS_NICK, '0')
 
 def delete_pep(jid, name):
-	user = gajim.get_room_and_nick_from_fjid(jid)[0]
+	user = common.gajim.get_room_and_nick_from_fjid(jid)[0]
 
-	if jid == gajim.get_jid_from_account(name):
-		acc = gajim.connections[name]
+	if jid == common.gajim.get_jid_from_account(name):
+		acc = common.gajim.connections[name]
 		del acc.activity
 		acc.activity = {}
 		user_send_tune(name)
@@ -553,7 +558,7 @@
 		del acc.mood
 		acc.mood = {}
 
-	for contact in gajim.contacts.get_contacts(name, user):
+	for contact in common.gajim.contacts.get_contacts(name, user):
 		del contact.activity
 		contact.activity = {}
 		del contact.tune
@@ -561,13 +566,13 @@
 		del contact.mood
 		contact.mood = {}
 
-	if jid == gajim.get_jid_from_account(name):
-		gajim.interface.roster.draw_account(name)
+	if jid == common.gajim.get_jid_from_account(name):
+		common.gajim.interface.roster.draw_account(name)
 
-	gajim.interface.roster.draw_activity(user, name)
-	gajim.interface.roster.draw_tune(user, name)
-	gajim.interface.roster.draw_mood(user, name)
-	ctrl = gajim.interface.msg_win_mgr.get_control(user, name)
+	common.gajim.interface.roster.draw_activity(user, name)
+	common.gajim.interface.roster.draw_tune(user, name)
+	common.gajim.interface.roster.draw_mood(user, name)
+	ctrl = common.gajim.interface.msg_win_mgr.get_control(user, name)
 	if ctrl:
 		ctrl.update_activity()
 		ctrl.update_tune()

Modified: branches/osx_newbuildsys/src/common/xmpp/simplexml.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/simplexml.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/xmpp/simplexml.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -413,7 +413,11 @@
 		self.check_data_buffer()
 		if self.__depth == self._dispatch_depth:
 			if self._mini_dom.getName() == 'error':
-				self.streamError = self._mini_dom.getChildren()[0].getName()
+				children = self._mini_dom.getChildren()
+				if children:
+					self.streamError = children[0].getName()
+				else:
+					self.streamError = self._mini_dom.getData()
 			self.dispatch(self._mini_dom)
 		elif self.__depth > self._dispatch_depth:
 			self._ptr = self._ptr.parent

Modified: branches/osx_newbuildsys/src/common/xmpp/transports_nb.py
===================================================================
--- branches/osx_newbuildsys/src/common/xmpp/transports_nb.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/xmpp/transports_nb.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -57,12 +57,13 @@
 	if proxy_type == 'bosh' and not proxy['bosh_useproxy']:
 		# with BOSH not over proxy we have to parse the hostname from BOSH URI 
 		tcp_host, tcp_port = urisplit(proxy['bosh_uri'])[1], proxy['bosh_port'] 
+		tcp_host = tcp_host.split(':')[0]
 	else: 
 		# with proxy!=bosh or with bosh over HTTP proxy we're connecting to proxy 
 		# machine 
 		tcp_host, tcp_port = proxy['host'], proxy['port'] 
-		if proxy['useauth']:
-			proxy_user, proxy_pass = proxy['user'], proxy['pass']
+	if proxy['useauth']:
+		proxy_user, proxy_pass = proxy['user'], proxy['pass']
 	return tcp_host, tcp_port, proxy_user, proxy_pass
 
 #: timeout to connect to the server socket, it doesn't include auth
@@ -686,6 +687,9 @@
 			httpbody - string with http body)
 		'''
 		message = message.replace('\r','')
+		# Remove latest \n
+		if message.endswith('\n'):
+			message = message[:-1]
 		(header, httpbody) = message.split('\n\n', 1)
 		header = header.split('\n')
 		statusline = header[0].split(' ', 2)

Modified: branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py
===================================================================
--- branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -689,8 +689,9 @@
 		# look for hashed connections
 		if to in self.recipient_to_hash:
 			conn = self.connections[self.recipient_to_hash[to]]
-			id_ = conn.Dispatcher.getAnID()
-			stanza.setID(id_)
+			if not stanza.getID():
+				id_ = conn.Dispatcher.getAnID()
+				stanza.setID(id_)
 			if conn.add_stanza(stanza, is_message):
 				if on_ok:
 					on_ok(id_)
@@ -699,14 +700,16 @@
 			hash_ = self.ip_to_hash[item['address']]
 			if self.hash_to_port[hash_] == item['port']:
 				conn = self.connections[hash_]
-				id_ = conn.Dispatcher.getAnID()
-				stanza.setID(id_)
+				if not stanza.getID():
+					id_ = conn.Dispatcher.getAnID()
+					stanza.setID(id_)
 				if conn.add_stanza(stanza, is_message):
 					if on_ok:
 						on_ok(id_)
 
 		# otherwise open new connection
-		stanza.setID('zero')
+		if not stanza.getID():
+			stanza.setID('zero')
 		P2PClient(None, item['address'], item['port'], self,
 			[(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok)
 

Modified: branches/osx_newbuildsys/src/config.py
===================================================================
--- branches/osx_newbuildsys/src/config.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/config.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -381,22 +381,27 @@
 
 		# Default Status messages
 		self.default_msg_tree = self.xml.get_widget('default_msg_treeview')
+		col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE]
 		# (status, translated_status, message, enabled)
 		model = gtk.ListStore(str, str, str, bool)
 		self.default_msg_tree.set_model(model)
 		col = gtk.TreeViewColumn(_('Status'))
+		col.set_resizable(True)
 		self.default_msg_tree.append_column(col)
 		renderer = gtk.CellRendererText()
 		col.pack_start(renderer, False)
 		col.set_attributes(renderer, text = 1)
 		col = gtk.TreeViewColumn(_('Default Message'))
+		col.set_resizable(True)
 		self.default_msg_tree.append_column(col)
 		renderer = gtk.CellRendererText()
 		col.pack_start(renderer, True)
 		col.set_attributes(renderer, text = 2)
 		renderer.connect('edited', self.on_default_msg_cell_edited)
 		renderer.set_property('editable', True)
+		renderer.set_property('cell-background', col2)
 		col = gtk.TreeViewColumn(_('Enabled'))
+		col.set_resizable(True)
 		self.default_msg_tree.append_column(col)
 		renderer = gtk.CellRendererToggle()
 		col.pack_start(renderer, False)
@@ -3112,18 +3117,6 @@
 				dialogs.ErrorDialog(pritext, str(s))
 				return
 
-			already_in_jids = []
-			for account in gajim.connections:
-				j = gajim.config.get_per('accounts', account, 'name')
-				j += '@' + gajim.config.get_per('accounts', account, 'hostname')
-				already_in_jids.append(j)
-
-			if jid in already_in_jids:
-				pritext = _('Duplicate Jabber ID')
-				sectext = _('This account is already configured in Gajim.')
-				dialogs.ErrorDialog(pritext, sectext)
-				return
-
 			self.account = server
 			i = 1
 			while self.account in gajim.connections:

Modified: branches/osx_newbuildsys/src/conversation_textview.py
===================================================================
--- branches/osx_newbuildsys/src/conversation_textview.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/conversation_textview.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -154,9 +154,15 @@
 		return False
 
 
-class ConversationTextview:
+class ConversationTextview(gobject.GObject):
 	'''Class for the conversation textview (where user reads already said
 	messages) for chat/groupchat windows'''
+	__gsignals__ = dict(
+		quote = (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION,
+			None, # return value
+			(str, ) # arguments
+		)
+	)
 
 	FOCUS_OUT_LINE_PIXBUF = gtk.gdk.pixbuf_new_from_file(os.path.join(
 		gajim.DATA_DIR, 'pixmaps', 'muc_separator.png'))
@@ -170,6 +176,7 @@
 	def __init__(self, account, used_in_history_window = False):
 		'''if used_in_history_window is True, then we do not show
 		Clear menuitem in context menu'''
+		gobject.GObject.__init__(self)
 		self.used_in_history_window = used_in_history_window
 
 		# no need to inherit TextView, use it as atrribute is safer
@@ -688,9 +695,15 @@
 				item = gtk.SeparatorMenuItem()
 				menu.prepend(item)
 
-			self.selected_phrase = helpers.reduce_chars_newlines(
+			if not self.used_in_history_window:
+				item = gtk.MenuItem(_('_Quote'))
+				id_ = item.connect('activate', self.on_quote)
+				self.handlers[id_] = item
+				menu.prepend(item)
+
+			_selected_phrase = helpers.reduce_chars_newlines(
 				self.selected_phrase, 25, 2)
-			item = gtk.MenuItem(_('_Actions for "%s"') % self.selected_phrase)
+			item = gtk.MenuItem(_('_Actions for "%s"') % _selected_phrase)
 			menu.prepend(item)
 			submenu = gtk.Menu()
 			item.set_submenu(submenu)
@@ -753,6 +766,9 @@
 
 		menu.show_all()
 
+	def on_quote(self, widget):
+		self.emit('quote', self.selected_phrase)
+
 	def on_textview_button_press_event(self, widget, event):
 		# If we clicked on a taged text do NOT open the standard popup menu
 		# if normal text check if we have sth selected
@@ -1249,7 +1265,7 @@
 		if xhtml:
 			try:
 				if name and (text.startswith('/me ') or text.startswith('/me\n')):
-					xhtml = xhtml.replace('/me', '<dfn>%s</dfn>' % (name,), 1)
+					xhtml = xhtml.replace('/me', '<i>* %s</i>' % (name,), 1)
 				self.tv.display_html(xhtml.encode('utf-8'))
 				return
 			except Exception, e:

Modified: branches/osx_newbuildsys/src/dataforms_widget.py
===================================================================
--- branches/osx_newbuildsys/src/dataforms_widget.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/dataforms_widget.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -81,6 +81,7 @@
 			self.instructions_label.hide()
 		else:
 			self.instructions_label.set_text(dataform.instructions)
+			gtkgui_helpers.label_set_autowrap(self.instructions_label)
 
 	def get_data_form(self):
 		''' Data form displayed in the widget or None if no form. '''

Modified: branches/osx_newbuildsys/src/dialogs.py
===================================================================
--- branches/osx_newbuildsys/src/dialogs.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/dialogs.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -218,6 +218,7 @@
 		cancelbutton.connect('clicked', self.on_cancelbutton_clicked)
 
 		self.xml.signal_autoconnect(self)
+		self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
 		self.window.show_all()
 
 		self.check = bool(checkbuttontext)
@@ -283,6 +284,7 @@
 		self.keys_treeview.set_search_column(1)
 		self.fill_tree(secret_keys, selected)
 		self.window.connect('response', self.on_dialog_response)
+		self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
 		self.window.show_all()
 
 	def sort_keys(self, model, iter1, iter2):
@@ -321,8 +323,11 @@
 		'having_appointment', 'inactive', 'relaxing', 'talking', 'traveling',
 		'working']
 
-	def __init__(self, account):
-		self.account = account
+	def __init__(self, on_response, activity=None, subactivity=None, text=''):
+		self.on_response = on_response
+		self.activity = activity
+		self.subactivity = subactivity
+		self.text = text
 		self.xml = gtkgui_helpers.get_glade(
 			'change_activity_dialog.glade')
 		self.window = self.xml.get_widget('change_activity_dialog')
@@ -332,9 +337,6 @@
 		self.notebook = self.xml.get_widget('notebook')
 		self.entry = self.xml.get_widget('description_entry')
 
-		self.activity = 'working'
-		self.subactivity = 'other'
-
 		rbtns = {}
 		group = None
 
@@ -392,32 +394,27 @@
 				rbtns[act].add(hbox)
 				vbox.pack_start(rbtns[act], False, False, 0)
 
-		rbtns['working_other'].set_active(True)
 
-		con = gajim.connections[account]
+		if self.activity in pep.ACTIVITIES:
+			if not self.subactivity in pep.ACTIVITIES[self.activity]:
+				self.subactivity = 'other'
 
-		if 'activity' in con.activity \
-		and con.activity['activity'] in pep.ACTIVITIES:
-			if 'subactivity' in con.activity \
-			and con.activity['subactivity'] in pep.ACTIVITIES[con.activity['activity']]:
-				subactivity = con.activity['subactivity']
-			else:
-				subactivity = 'other'
+			rbtns[self.activity + '_' + self.subactivity].set_active(True)
 
-			rbtns[con.activity['activity'] + '_' + subactivity]. \
-				set_active(True)
-
 			self.checkbutton.set_active(True)
 			self.notebook.set_sensitive(True)
 			self.entry.set_sensitive(True)
 
 			self.notebook.set_current_page(
-				self.PAGELIST.index(con.activity['activity']))
+				self.PAGELIST.index(self.activity))
 
-		if 'text' in con.activity:
-			self.entry.set_text(con.activity['text'])
+			self.entry.set_text(text)
 
+		else:
+			self.checkbutton.set_active(False)
+
 		self.xml.signal_autoconnect(self)
+		self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
 		self.window.show_all()
 
 	def on_enable_checkbutton_toggled(self, widget):
@@ -434,11 +431,10 @@
 		Return activity and messsage (None if no activity selected)
 		'''
 		if self.checkbutton.get_active():
-			pep.user_send_activity(self.account, self.activity,
-				self.subactivity,
+			self.on_response(self.activity, self.subactivity,
 				self.entry.get_text().decode('utf-8'))
 		else:
-			pep.user_send_activity(self.account, '')
+			self.on_response(None, None, '')
 		self.window.destroy()
 
 	def on_cancel_button_clicked(self, widget):
@@ -447,10 +443,11 @@
 class ChangeMoodDialog:
 	COLS = 11
 
-	def __init__(self, account):
-		self.account = account
+	def __init__(self, on_response, mood=None, text=''):
+		self.on_response = on_response
+		self.mood = mood
+		self.text = text
 		self.xml = gtkgui_helpers.get_glade('change_mood_dialog.glade')
-		self.mood = None
 
 		self.window = self.xml.get_widget('change_mood_dialog')
 		self.window.set_transient_for(gajim.interface.roster.window)
@@ -491,24 +488,19 @@
 				x = 0
 				y += 1
 
-		con = gajim.connections[account]
-		if 'mood' in con.mood:
-			self.mood = con.mood['mood']
-			if self.mood in pep.MOODS:
-				self.mood_buttons[self.mood].set_active(True)
-				self.label.set_text(pep.MOODS[self.mood])
-			else:
-				self.label.set_text(self.mood)
-
-		if self.mood:
+		if self.mood in pep.MOODS:
+			self.mood_buttons[self.mood].set_active(True)
+			self.label.set_text(pep.MOODS[self.mood])
 			self.entry.set_sensitive(True)
+			if self.text:
+				self.entry.set_text(self.text)
 		else:
+			self.label.set_text(_('None'))
+			self.entry.set_text('')
 			self.entry.set_sensitive(False)
 
-		if 'text' in con.mood:
-			self.entry.set_text(con.mood['text'])
-
 		self.xml.signal_autoconnect(self)
+		self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
 		self.window.show_all()
 
 	def on_mood_button_clicked(self, widget, data):
@@ -524,25 +516,25 @@
 	def on_ok_button_clicked(self, widget):
 		'''Return mood and messsage (None if no mood selected)'''
 		message = self.entry.get_text().decode('utf-8')
-		if self.mood is None:
-			pep.user_send_mood(self.account, '')
-		else:
-			pep.user_send_mood(self.account, self.mood, message)
+		self.on_response(self.mood, message)
 		self.window.destroy()
 
 	def on_cancel_button_clicked(self, widget):
 		self.window.destroy()
 
 class ChangeStatusMessageDialog:
-	def __init__(self, on_response, show=None):
+	def __init__(self, on_response, show=None, pep_dict=None):
 		self.show = show
+		self.pep_dict = pep_dict
 		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)
+		msg = None
 		if show:
 			uf_show = helpers.get_uf_show(show)
 			self.title_text = _('%s Status Message') % uf_show
+			msg = gajim.config.get('last_status_msg_' + show)
 		else:
 			self.title_text = _('Status Message')
 		self.window.set_title(self.title_text)
@@ -551,24 +543,24 @@
 		self.message_buffer = message_textview.get_buffer()
 		self.message_buffer.connect('changed',
 			self.toggle_sensitiviy_of_save_as_preset)
-		msg = None
-		if show:
-			msg = gajim.config.get('last_status_msg_' + show)
 		if not msg:
 			msg = ''
 		msg = helpers.from_one_line(msg)
 		self.message_buffer.set_text(msg)
 
 		# have an empty string selectable, so user can clear msg
-		self.preset_messages_dict = {'': ''}
+		self.preset_messages_dict = {'': ['', '', '', '', '', '']}
 		for msg_name in gajim.config.get_per('statusmsg'):
-			msg_text = gajim.config.get_per('statusmsg', msg_name, 'message')
-			msg_text = helpers.from_one_line(msg_text)
-			self.preset_messages_dict[msg_name] = msg_text
+			opts = []
+			for opt in ['message', 'activity', 'subactivity', 'activity_text',
+			'mood', 'mood_text']:
+				opts.append(gajim.config.get_per('statusmsg', msg_name, opt))
+			opts[0] = helpers.from_one_line(opts[0])
+			self.preset_messages_dict[msg_name] = opts
 		sorted_keys_list = helpers.get_sorted_keys(self.preset_messages_dict)
 
-		self.countdown_time = gajim.config.get('change_status_window_timeout')
-		self.countdown_left = self.countdown_time
+		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
@@ -579,13 +571,63 @@
 		self.message_combobox.add_attribute(cellrenderertext, 'text', 0)
 		for msg_name in sorted_keys_list:
 			self.message_liststore.append((msg_name,))
+
+		if pep_dict:
+			self.draw_activity()
+			self.draw_mood()
+		else:
+			# remove acvtivity / mood lines
+			self.xml.get_widget('activity_label').set_no_show_all(True)
+			self.xml.get_widget('activity_button').set_no_show_all(True)
+			self.xml.get_widget('mood_label').set_no_show_all(True)
+			self.xml.get_widget('mood_button').set_no_show_all(True)
+			self.xml.get_widget('activity_label').hide()
+			self.xml.get_widget('activity_button').hide()
+			self.xml.get_widget('mood_label').hide()
+			self.xml.get_widget('mood_button').hide()
+
 		self.xml.signal_autoconnect(self)
-		if self.countdown_time > 0:
+		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()
 
+	def draw_activity(self):
+		'''Set activity button'''
+		img = self.xml.get_widget('activity_image')
+		label = self.xml.get_widget('activity_button_label')
+		if 'activity' in self.pep_dict and self.pep_dict['activity'] in \
+		pep.ACTIVITIES:
+			if 'subactivity' in self.pep_dict and self.pep_dict['subactivity'] in \
+			pep.ACTIVITIES[self.pep_dict['activity']]:
+				img.set_from_pixbuf(gtkgui_helpers.load_activity_icon(
+					self.pep_dict['activity'], self.pep_dict['subactivity']).\
+					get_pixbuf())
+			else:
+				img.set_from_pixbuf(gtkgui_helpers.load_activity_icon(
+					self.pep_dict['activity']).get_pixbuf())
+#			gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category'])
+			if self.pep_dict['activity_text']:
+				label.set_text(self.pep_dict['activity_text'])
+		else:
+			img.set_from_pixbuf(None)
+			label.set_text('')
+
+	def draw_mood(self):
+		'''Set mood button'''
+		img = self.xml.get_widget('mood_image')
+		label = self.xml.get_widget('mood_button_label')
+		if self.pep_dict['mood'] in pep.MOODS:
+			img.set_from_pixbuf(gtkgui_helpers.load_mood_icon(
+				self.pep_dict['mood']).get_pixbuf())
+			if self.pep_dict['mood_text']:
+				label.set_text(self.pep_dict['mood_text'])
+		else:
+			img.set_from_pixbuf(None)
+			label.set_text('')
+
 	def countdown(self):
 		if self.countdown_enabled:
 			if self.countdown_left <= 0:
@@ -613,7 +655,7 @@
 		else:
 			message = None # user pressed Cancel button or X wm button
 		self.window.destroy()
-		self.on_response(message)
+		self.on_response(message, self.pep_dict)
 
 	def on_message_combobox_changed(self, widget):
 		self.countdown_enabled = False
@@ -622,7 +664,14 @@
 		if active < 0:
 			return None
 		name = model[active][0].decode('utf-8')
-		self.message_buffer.set_text(self.preset_messages_dict[name])
+		self.message_buffer.set_text(self.preset_messages_dict[name][0])
+		self.pep_dict['activity'] = self.preset_messages_dict[name][1]
+		self.pep_dict['subactivity'] = self.preset_messages_dict[name][2]
+		self.pep_dict['activity_text'] = self.preset_messages_dict[name][3]
+		self.pep_dict['mood'] = self.preset_messages_dict[name][4]
+		self.pep_dict['mood_text'] = self.preset_messages_dict[name][5]
+		self.draw_activity()
+		self.draw_mood()
 
 	def on_change_status_message_dialog_key_press_event(self, widget, event):
 		self.countdown_enabled = False
@@ -651,25 +700,55 @@
 			if not msg_name: # msg_name was ''
 				msg_name = msg_text_1l.decode('utf-8')
 
+			def on_ok2():
+				self.preset_messages_dict[msg_name] = [msg_text, self.pep_dict.get(
+					'activity'), self.pep_dict.get('subactivity'), self.pep_dict.get(
+					'activity_text'), self.pep_dict.get('mood'), self.pep_dict.get(
+					'mood_text')]
+				gajim.config.set_per('statusmsg', msg_name, 'message', msg_text_1l)
+				gajim.config.set_per('statusmsg', msg_name, 'activity',
+					self.pep_dict.get('activity'))
+				gajim.config.set_per('statusmsg', msg_name, 'subactivity',
+					self.pep_dict.get('subactivity'))
+				gajim.config.set_per('statusmsg', msg_name, 'activity_text',
+					self.pep_dict.get('activity_text'))
+				gajim.config.set_per('statusmsg', msg_name, 'mood',
+					self.pep_dict.get('mood'))
+				gajim.config.set_per('statusmsg', msg_name, 'mood_text',
+					self.pep_dict.get('mood_text'))
 			if msg_name in self.preset_messages_dict:
-				def on_ok2():
-					self.preset_messages_dict[msg_name] = msg_text
-					gajim.config.set_per('statusmsg', msg_name, 'message',
-						msg_text_1l)
 				ConfirmationDialog(_('Overwrite Status Message?'),
 					_('This name is already used. Do you want to overwrite this '
 					'status message?'), on_response_ok=on_ok2)
 				return
-			self.preset_messages_dict[msg_name] = msg_text
+			gajim.config.add_per('statusmsg', msg_name)
+			on_ok2()
 			iter_ = self.message_liststore.append((msg_name,))
-			gajim.config.add_per('statusmsg', msg_name)
 			# select in combobox the one we just saved
 			self.message_combobox.set_active_iter(iter_)
-			gajim.config.set_per('statusmsg', msg_name, 'message', msg_text_1l)
 		InputDialog(_('Save as Preset Status Message'),
 			_('Please type a name for this status message'), is_modal=False,
 			ok_handler=on_ok)
 
+	def on_activity_button_clicked(self, widget):
+		self.countdown_enabled = False
+		def on_response(activity, subactivity, text):
+			self.pep_dict['activity'] = activity
+			self.pep_dict['subactivity'] = subactivity
+			self.pep_dict['activity_text'] = text
+			self.draw_activity()
+		ChangeActivityDialog(on_response, self.pep_dict['activity'],
+			self.pep_dict['subactivity'], self.pep_dict['activity_text'])
+
+	def on_mood_button_clicked(self, widget):
+		self.countdown_enabled = False
+		def on_response(mood, text):
+			self.pep_dict['mood'] = mood
+			self.pep_dict['mood_text'] = text
+			self.draw_mood()
+		ChangeMoodDialog(on_response, self.pep_dict['mood'],
+			self.pep_dict['mood_text'])
+
 class AddNewContactWindow:
 	'''Class for AddNewContactWindow'''
 	uid_labels = {'jabber': _('Jabber ID:'),
@@ -1620,7 +1699,8 @@
 		'''accept the request'''
 		gajim.connections[self.account].send_authorization(self.jid)
 		self.window.destroy()
-		if self.jid not in gajim.contacts.get_jid_list(self.account):
+		contact = gajim.contacts.get_contact(self.account, self.jid)
+		if not contact or _('Not in Roster') in contact.groups:
 			AddNewContactWindow(self.account, self.jid, self.user_nick)
 
 	def on_contact_info_activate(self, widget):
@@ -2026,8 +2106,7 @@
 
 		xml = gtkgui_helpers.get_glade('popup_notification_window.glade')
 		self.window = xml.get_widget('popup_notification_window')
-		if gtk.gtk_version >= (2, 10, 0) and gtk.pygtk_version >= (2, 10, 0):
-			self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP)
+		self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP)
 		close_button = xml.get_widget('close_button')
 		event_type_label = xml.get_widget('event_type_label')
 		event_description_label = xml.get_widget('event_description_label')
@@ -2426,9 +2505,14 @@
 		self.tagIn = buffer_.create_tag('incoming')
 		color = gajim.config.get('inmsgcolor')
 		self.tagIn.set_property('foreground', color)
+		self.tagInComment = buffer_.create_tag('in_comment')
+		self.tagInComment.set_property('foreground', color)
+
 		self.tagOut = buffer_.create_tag('outgoing')
 		color = gajim.config.get('outmsgcolor')
 		self.tagOut.set_property('foreground', color)
+		self.tagOutComment = buffer_.create_tag('out_comment')
+		self.tagOutComment.set_property('foreground', color)
 
 		self.enabled = False
 
@@ -2482,6 +2566,13 @@
 		if end_rect.y <= (visible_rect.y + visible_rect.height):
 			at_the_end = True
 		end_iter = buffer.get_end_iter()
+		if kind == 'incoming':
+			buffer.insert_with_tags_by_name(end_iter, '<!-- In -->\n', 
+					'in_comment')
+		elif kind == 'outgoing':
+			buffer.insert_with_tags_by_name(end_iter, '<!-- Out -->\n', 
+					'out_comment')
+		end_iter = buffer.get_end_iter()
 		buffer.insert_with_tags_by_name(end_iter, stanza.replace('><', '>\n<') + \
 			'\n\n', kind)
 		if at_the_end:
@@ -2998,6 +3089,7 @@
 		self.progressbar = self.xml.get_widget('progressbar')
 		self.dialog.set_title(title_text)
 		self.dialog.set_default_size(450, 250)
+		self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
 		self.dialog.show_all()
 		self.xml.signal_autoconnect(self)
 

Modified: branches/osx_newbuildsys/src/features_window.py
===================================================================
--- branches/osx_newbuildsys/src/features_window.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/features_window.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -240,8 +240,7 @@
 		return True
 
 	def trayicon_available(self):
-		if os.name == 'nt' and gtk.pygtk_version >= (2, 10, 0) and \
-		gtk.gtk_version >= (2, 10, 0):
+		if os.name == 'nt':
 			return True
 		try:
 			import systray

Modified: branches/osx_newbuildsys/src/gajim.py
===================================================================
--- branches/osx_newbuildsys/src/gajim.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/gajim.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -171,12 +171,12 @@
 		except Exception:
 			pass
 
-	if gtk.pygtk_version < (2, 8, 0):
-		pritext = _('Gajim needs PyGTK 2.8 or above')
-		sectext = _('Gajim needs PyGTK 2.8 or above to run. Quiting...')
-	elif gtk.gtk_version < (2, 8, 0):
-		pritext = _('Gajim needs GTK 2.8 or above')
-		sectext = _('Gajim needs GTK 2.8 or above to run. Quiting...')
+	if gtk.pygtk_version < (2, 12, 0):
+		pritext = _('Gajim needs PyGTK 2.12 or above')
+		sectext = _('Gajim needs PyGTK 2.12 or above to run. Quiting...')
+	elif gtk.gtk_version < (2, 12, 0):
+		pritext = _('Gajim needs GTK 2.12 or above')
+		sectext = _('Gajim needs GTK 2.12 or above to run. Quiting...')
 
 	try:
 		import gtk.glade # check if user has libglade (in pygtk and in gtk)
@@ -393,8 +393,8 @@
 	# delete pid file on normal exit
 	if os.path.exists(pid_filename):
 		os.remove(pid_filename)
-	# Save config
-	gajim.interface.save_config()
+	# Shutdown GUI and save config
+	gajim.interface.roster.quit_gtkgui_interface()
 	if sys.platform == 'darwin':
 		try:
 			osx.shutdown()
@@ -484,19 +484,19 @@
 		self.dialog_created = True
 
 
-class ThreadInterface: 
-		def __init__(self, func, func_args, callback, callback_args): 
-			'''Call a function in a thread 
-			
-			:param func: the function to call in the thread 
-			:param func_args: list or arguments for this function 
-			:param callback: callback to call once function is finished 
-			:param callback_args: list of arguments for this callback 
-			''' 
-			def thread_function(func, func_args, callback, callback_args): 
-				output = func(*func_args) 
-				gobject.idle_add(callback, output, *callback_args) 
-			Thread(target=thread_function, args=(func, func_args, callback, 
+class ThreadInterface:
+		def __init__(self, func, func_args, callback, callback_args):
+			'''Call a function in a thread
+
+			:param func: the function to call in the thread
+			:param func_args: list or arguments for this function
+			:param callback: callback to call once function is finished
+			:param callback_args: list of arguments for this callback
+			'''
+			def thread_function(func, func_args, callback, callback_args):
+				output = func(*func_args)
+				gobject.idle_add(callback, output, *callback_args)
+			Thread(target=thread_function, args=(func, func_args, callback,
 				callback_args)).start()
 
 class Interface:
@@ -1204,13 +1204,14 @@
 			win = self.instances[account]['infos'][array[0]]
 		elif array[0] + '/' + array[1] in self.instances[account]['infos']:
 			win = self.instances[account]['infos'][array[0] + '/' + array[1]]
+		c = gajim.contacts.get_contact(account, array[0], array[1])
+		if c: # c can be none if it's a gc contact
+			c.last_status_time = time.localtime(time.time() - tim)
+			if array[3]:
+				c.status = array[3]
+				self.roster.draw_contact(c.jid, account) # draw offline status
 		if win:
-			c = gajim.contacts.get_contact(account, array[0], array[1])
-			if c: # c can be none if it's a gc contact
-				c.last_status_time = time.localtime(time.time() - tim)
-				if array[3]:
-					c.status = array[3]
-				win.set_last_status_time()
+			win.set_last_status_time()
 		if self.remote_ctrl:
 			self.remote_ctrl.raise_signal('LastStatusTime', (account, array))
 
@@ -1875,6 +1876,11 @@
 			win = self.instances[account]['profile']
 			win.vcard_not_published()
 
+	def ask_offline_status(self, account):
+		for contact in gajim.contacts.iter_contacts(account):
+			gajim.connections[account].request_last_status_time(contact.jid,
+				contact.resource)
+
 	def handle_event_signed_in(self, account, empty):
 		'''SIGNED_IN event is emitted when we sign in, so handle it'''
 		# block signed in notifications for 30 seconds
@@ -1883,6 +1889,10 @@
 		self.roster.draw_account(account)
 		state = self.sleeper.getState()
 		connected = gajim.connections[account].connected
+		if gajim.config.get('ask_offline_status_on_connection'):
+			# Ask offline status in 1 minute so w'are sure we got all online
+			# presences
+			gobject.timeout_add_seconds(60, self.ask_offline_status, account)
 		if state != common.sleepy.STATE_UNKNOWN and connected in (2, 3):
 			# we go online or free for chat, so we activate auto status
 			gajim.sleeper_state[account] = 'online'
@@ -2354,8 +2364,15 @@
 			else:
 				self.roster.draw_contact(jid, account)
 
-		# Select the contact in roster, it's visible because it has events.
-		self.roster.select_contact(jid, account)
+		# Select the big brother contact in roster, it's visible because it has
+		# events.
+		family = gajim.contacts.get_metacontacts_family(account, jid)
+		if family:
+			nearby_family, bb_jid, bb_account = \
+				self.roster._get_nearby_family_and_big_brother(family, account)
+		else:
+			bb_jid, bb_account = jid, account
+		self.roster.select_contact(bb_jid, bb_account)
 
 	def handle_event(self, account, fjid, type_):
 		w = None
@@ -3004,13 +3021,18 @@
 					shows[show] = [a]
 				else:
 					shows[show].append(a)
-		def on_message(message):
+		def on_message(message, pep_dict):
 			if message is None:
 				return
 			for a in shows[show]:
 				self.roster.send_status(a, show, message)
+				self.roster.send_pep(a, pep_dict)
 		for show in shows:
-			message = self.roster.get_status_message(show, on_message)
+			if len(shows[show]) == 1:
+				pep_dict = helpers.get_pep_dict(shows[show][0])
+			else:
+				pep_dict = helpers.get_global_pep()
+			message = self.roster.get_status_message(show, pep_dict, on_message)
 		return False
 
 	def show_systray(self):
@@ -3249,10 +3271,17 @@
 			pass
 		# add default status messages if there is not in the config file
 		if len(gajim.config.get_per('statusmsg')) == 0:
-			for msg in gajim.config.statusmsg_default:
+			default = gajim.config.statusmsg_default
+			for msg in default:
 				gajim.config.add_per('statusmsg', msg)
-				gajim.config.set_per('statusmsg', msg, 'message',
-					gajim.config.statusmsg_default[msg])
+				gajim.config.set_per('statusmsg', msg, 'message', default[msg][0])
+				gajim.config.set_per('statusmsg', msg, 'activity', default[msg][1])
+				gajim.config.set_per('statusmsg', msg, 'subactivity',
+					default[msg][2])
+				gajim.config.set_per('statusmsg', msg, 'activity_text',
+					default[msg][3])
+				gajim.config.set_per('statusmsg', msg, 'mood', default[msg][4])
+				gajim.config.set_per('statusmsg', msg, 'mood_text', default[msg][5])
 		#add default themes if there is not in the config file
 		theme = gajim.config.get('roster_theme')
 		if not theme in gajim.config.get_per('themes'):
@@ -3295,8 +3324,7 @@
 		# gtk hooks
 		gtk.about_dialog_set_email_hook(self.on_launch_browser_mailer, 'mail')
 		gtk.about_dialog_set_url_hook(self.on_launch_browser_mailer, 'url')
-		if gtk.pygtk_version >= (2, 10, 0) and gtk.gtk_version >= (2, 10, 0):
-			gtk.link_button_set_uri_hook(self.on_launch_browser_mailer, 'url')
+		gtk.link_button_set_uri_hook(self.on_launch_browser_mailer, 'url')
 
 		self.instances = {}
 
@@ -3385,9 +3413,7 @@
 		self.systray_enabled = False
 		self.systray_capabilities = False
 
-		if ((os.name == 'nt' or sys.platform == 'darwin') and
-			(gtk.pygtk_version >= (2, 10, 0)) and
-			(gtk.gtk_version >= (2, 10, 0))):
+		if (os.name == 'nt') or (sys.platform == 'darwin'):
 			import statusicon
 			self.systray = statusicon.StatusIcon()
 			self.systray_capabilities = True
@@ -3518,6 +3544,7 @@
 	Interface()
 
 	try:
+		gtk.gdk.threads_init()
 		gtk.main()
 	except KeyboardInterrupt:
 		print >> sys.stderr, 'KeyboardInterrupt'

Modified: branches/osx_newbuildsys/src/groupchat_control.py
===================================================================
--- branches/osx_newbuildsys/src/groupchat_control.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/groupchat_control.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -276,49 +276,6 @@
 		self.number_of_colors = len(gajim.config.get('gc_nicknames_colors').\
 			split(':'))
 
-		# connect the menuitems to their respective functions
-		xm = gtkgui_helpers.get_glade('gc_control_popup_menu.glade')
-
-		self.bookmark_room_menuitem = xm.get_widget('bookmark_room_menuitem')
-		id_ = self.bookmark_room_menuitem.connect('activate',
-			self._on_bookmark_room_menuitem_activate)
-		self.handlers[id_] = self.bookmark_room_menuitem
-
-		self.change_nick_menuitem = xm.get_widget('change_nick_menuitem')
-		id_ = self.change_nick_menuitem.connect('activate',
-			self._on_change_nick_menuitem_activate)
-		self.handlers[id_] = self.change_nick_menuitem
-
-		self.configure_room_menuitem = xm.get_widget('configure_room_menuitem')
-		id_ = self.configure_room_menuitem.connect('activate',
-			self._on_configure_room_menuitem_activate)
-		self.handlers[id_] = self.configure_room_menuitem
-
-		self.destroy_room_menuitem = xm.get_widget('destroy_room_menuitem')
-		id_ = self.destroy_room_menuitem.connect('activate',
-			self._on_destroy_room_menuitem_activate)
-		self.handlers[id_] = self.destroy_room_menuitem
-
-		self.change_subject_menuitem = xm.get_widget('change_subject_menuitem')
-		id_ = self.change_subject_menuitem.connect('activate',
-			self._on_change_subject_menuitem_activate)
-		self.handlers[id_] = self.change_subject_menuitem
-
-		self.history_menuitem = xm.get_widget('history_menuitem')
-		id_ = self.history_menuitem.connect('activate',
-			self._on_history_menuitem_activate)
-		self.handlers[id_] = self.history_menuitem
-
-		self.minimize_menuitem = xm.get_widget('minimize_menuitem')
-		id_ = self.minimize_menuitem.connect('toggled',
-			self.on_minimize_menuitem_toggled)
-		self.handlers[id_] = self.minimize_menuitem
-
-		self.bookmark_separator = xm.get_widget('bookmark_separator')
-		self.separatormenuitem2 = xm.get_widget('separatormenuitem2')
-
-		self.gc_popup_menu = xm.get_widget('gc_control_popup_menu')
-
 		self.name_label = self.xml.get_widget('banner_name_label')
 		self.event_box = self.xml.get_widget('banner_eventbox')
 
@@ -645,63 +602,123 @@
 
 	def prepare_context_menu(self, hide_buttonbar_entries=False):
 		'''sets sensitivity state for configure_room'''
-		ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
-		self.change_nick_menuitem.add_accelerator('activate', ag, gtk.keysyms.n,
-			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
-		self.change_subject_menuitem.add_accelerator('activate', ag,
-			gtk.keysyms.t, gtk.gdk.MOD1_MASK, gtk.ACCEL_VISIBLE)
-		self.bookmark_room_menuitem.add_accelerator('activate', ag, gtk.keysyms.b,
-			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
-		self.history_menuitem.add_accelerator('activate', ag, gtk.keysyms.h,
-			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+		xml = gtkgui_helpers.get_glade('gc_control_popup_menu.glade')
+		menu = xml.get_widget('gc_control_popup_menu')
 
+		bookmark_room_menuitem = xml.get_widget('bookmark_room_menuitem')
+		change_nick_menuitem = xml.get_widget('change_nick_menuitem')
+		configure_room_menuitem = xml.get_widget('configure_room_menuitem')
+		destroy_room_menuitem = xml.get_widget('destroy_room_menuitem')
+		change_subject_menuitem = xml.get_widget('change_subject_menuitem')
+		history_menuitem = xml.get_widget('history_menuitem')
+		minimize_menuitem = xml.get_widget('minimize_menuitem')
+		bookmark_separator = xml.get_widget('bookmark_separator')
+		separatormenuitem2 = xml.get_widget('separatormenuitem2')
+
 		if hide_buttonbar_entries:
-			self.change_nick_menuitem.hide()
-			self.change_subject_menuitem.hide()
-			self.bookmark_room_menuitem.hide()
-			self.history_menuitem.hide()
-			self.bookmark_separator.hide()
-			self.separatormenuitem2.hide()
+			change_nick_menuitem.hide()
+			change_subject_menuitem.hide()
+			bookmark_room_menuitem.hide()
+			history_menuitem.hide()
+			bookmark_separator.hide()
+			separatormenuitem2.hide()
 		else:
-			self.change_nick_menuitem.show()
-			self.change_subject_menuitem.show()
-			self.bookmark_room_menuitem.show()
-			self.history_menuitem.show()
-			self.bookmark_separator.show()
-			self.separatormenuitem2.show()
+			change_nick_menuitem.show()
+			change_subject_menuitem.show()
+			bookmark_room_menuitem.show()
+			history_menuitem.show()
+			bookmark_separator.show()
+			separatormenuitem2.show()
 			for bm in gajim.connections[self.account].bookmarks:
 				if bm['jid'] == self.room_jid:
-					self.bookmark_room_menuitem.hide()
-					self.bookmark_separator.hide()
+					bookmark_room_menuitem.hide()
+					bookmark_separator.hide()
 					break
 
+		ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
+		change_nick_menuitem.add_accelerator('activate', ag, gtk.keysyms.n,
+			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+		change_subject_menuitem.add_accelerator('activate', ag,
+			gtk.keysyms.t, gtk.gdk.MOD1_MASK, gtk.ACCEL_VISIBLE)
+		bookmark_room_menuitem.add_accelerator('activate', ag, gtk.keysyms.b,
+			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+		history_menuitem.add_accelerator('activate', ag, gtk.keysyms.h,
+			gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+
 		if self.contact.jid in gajim.config.get_per('accounts', self.account,
 		'minimized_gc').split(' '):
-			self.minimize_menuitem.set_active(True)
+			minimize_menuitem.set_active(True)
 		if not gajim.connections[self.account].private_storage_supported:
-			self.bookmark_room_menuitem.set_sensitive(False)
+			bookmark_room_menuitem.set_sensitive(False)
 		if gajim.gc_connected[self.account][self.room_jid]:
 			c = gajim.contacts.get_gc_contact(self.account, self.room_jid,
 				self.nick)
 			if c.affiliation not in ('owner', 'admin'):
-				self.configure_room_menuitem.set_sensitive(False)
+				configure_room_menuitem.set_sensitive(False)
 			else:
-				self.configure_room_menuitem.set_sensitive(True)
+				configure_room_menuitem.set_sensitive(True)
 			if c.affiliation != 'owner':
-				self.destroy_room_menuitem.set_sensitive(False)
+				destroy_room_menuitem.set_sensitive(False)
 			else:
-				self.destroy_room_menuitem.set_sensitive(True)
-			self.change_subject_menuitem.set_sensitive(True)
-			self.change_nick_menuitem.set_sensitive(True)
+				destroy_room_menuitem.set_sensitive(True)
+			change_subject_menuitem.set_sensitive(True)
+			change_nick_menuitem.set_sensitive(True)
 		else:
 			# We are not connected to this groupchat, disable unusable menuitems
-			self.configure_room_menuitem.set_sensitive(False)
-			self.destroy_room_menuitem.set_sensitive(False)
-			self.change_subject_menuitem.set_sensitive(False)
-			self.change_nick_menuitem.set_sensitive(False)
+			configure_room_menuitem.set_sensitive(False)
+			destroy_room_menuitem.set_sensitive(False)
+			change_subject_menuitem.set_sensitive(False)
+			change_nick_menuitem.set_sensitive(False)
 
-		return self.gc_popup_menu
+		# connect the menuitems to their respective functions
+		id_ = bookmark_room_menuitem.connect('activate',
+			self._on_bookmark_room_menuitem_activate)
+		self.handlers[id_] = bookmark_room_menuitem
 
+		id_ = change_nick_menuitem.connect('activate',
+			self._on_change_nick_menuitem_activate)
+		self.handlers[id_] = change_nick_menuitem
+
+		id_ = configure_room_menuitem.connect('activate',
+			self._on_configure_room_menuitem_activate)
+		self.handlers[id_] = configure_room_menuitem
+
+		id_ = destroy_room_menuitem.connect('activate',
+			self._on_destroy_room_menuitem_activate)
+		self.handlers[id_] = destroy_room_menuitem
+
+		id_ = change_subject_menuitem.connect('activate',
+			self._on_change_subject_menuitem_activate)
+		self.handlers[id_] = change_subject_menuitem
+
+		id_ = history_menuitem.connect('activate',
+			self._on_history_menuitem_activate)
+		self.handlers[id_] = history_menuitem
+
+		id_ = minimize_menuitem.connect('toggled',
+			self.on_minimize_menuitem_toggled)
+		self.handlers[id_] = minimize_menuitem
+
+		menu.connect('selection-done', self.destroy_menu,
+         change_nick_menuitem, change_subject_menuitem,
+         bookmark_room_menuitem, history_menuitem)
+		return menu
+
+	def destroy_menu(self, menu, change_nick_menuitem, change_subject_menuitem,
+	bookmark_room_menuitem, history_menuitem):
+		# destroy accelerators
+		ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
+		change_nick_menuitem.remove_accelerator(ag, gtk.keysyms.n,
+			gtk.gdk.CONTROL_MASK)
+		change_subject_menuitem.remove_accelerator(ag, gtk.keysyms.t,
+			gtk.gdk.MOD1_MASK)
+		bookmark_room_menuitem.remove_accelerator(ag, gtk.keysyms.b,
+			gtk.gdk.CONTROL_MASK)
+		history_menuitem.remove_accelerator(ag, gtk.keysyms.h,
+			gtk.gdk.CONTROL_MASK)
+		# destroy menu
+		menu.destroy()
+
 	def on_message(self, nick, msg, tim, has_timestamp=False, xhtml=None,
 	status_code=[]):
 		if '100' in status_code:
@@ -1004,21 +1021,7 @@
 
 	def on_send_file(self, widget, gc_contact):
 		'''sends a file to a contact in the room'''
-		def _on_send_files(gc_c):
-			gajim.interface.instances['file_transfers'].show_file_send_request(
-				self.account, gc_c)
-		self_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid,
-			self.nick)
-		if self.is_anonymous and gc_contact.affiliation not in ['admin', 'owner']\
-		and self_contact.affiliation in ['admin', 'owner']:
-			prim_text = _('Really send file?')
-			sec_text = _('If you send a file to %s, he/she will know your real '
-				'Jabber ID.') % gc_contact.name
-			dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text,
-				on_response_ok = (_on_send_files, gc_contact))
-			dialog.popup()
-		else:
-			_on_send_files(gc_contact)
+		self._on_send_file(gc_contact)
 
 	def draw_contact(self, nick, selected=False, focus=False):
 		iter_ = self.get_contact_iter(nick)
@@ -1454,7 +1457,8 @@
 					dialogs.ErrorDialog(_('Invalid nickname'),
 					_('The nickname has not allowed characters.'))
 					return True
-				gajim.connections[self.account].join_gc(nick, self.room_jid, None)
+				gajim.connections[self.account].join_gc(nick, self.room_jid, None,
+					change_nick=True)
 				self.new_nick = nick
 				self.clear(self.msg_textview)
 			else:
@@ -1737,7 +1741,8 @@
 				dialogs.ErrorDialog(_('Invalid nickname'),
 				_('The nickname has not allowed characters.'))
 				return
-			gajim.connections[self.account].join_gc(nick, self.room_jid, None)
+			gajim.connections[self.account].join_gc(nick, self.room_jid, None,
+				change_nick=True)
 			if gajim.gc_connected[self.account][self.room_jid]:
 				# We are changing nick, we will change self.nick when we receive
 				# presence that inform that it works
@@ -1754,6 +1759,12 @@
 			proposed_nick, is_modal=False, ok_handler=on_ok,
 			cancel_handler=on_cancel)
 
+	def minimizable(self):
+		if self.contact.jid in gajim.config.get_per('accounts', self.account,
+		'minimized_gc').split(' '):
+			return True
+		return False
+
 	def minimize(self, status='offline'):
 		# Minimize it
 		win = gajim.interface.msg_win_mgr.get_window(self.contact.jid,
@@ -1810,9 +1821,20 @@
 		# Remove unread events from systray
 		gajim.events.remove_events(self.account, self.room_jid)
 
+	def safe_shutdown(self):
+		if self.minimizable():
+			return True
+		includes = gajim.config.get('confirm_close_muc_rooms').split(' ')
+		excludes = gajim.config.get('noconfirm_close_muc_rooms').split(' ')
+		# whether to ask for comfirmation before closing muc
+		if (gajim.config.get('confirm_close_muc') or self.room_jid in includes) \
+		and gajim.gc_connected[self.account][self.room_jid] and self.room_jid not\
+		in excludes:
+			return False
+		return True
+
 	def allow_shutdown(self, method, on_yes, on_no, on_minimize):
-		if self.contact.jid in gajim.config.get_per('accounts', self.account,
-		'minimized_gc').split(' '):
+		if self.minimizable():
 			on_minimize(self)
 			return
 		if method == self.parent_win.CLOSE_ESC:

Modified: branches/osx_newbuildsys/src/gtkgui_helpers.py
===================================================================
--- branches/osx_newbuildsys/src/gtkgui_helpers.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/gtkgui_helpers.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -982,4 +982,31 @@
 	make_jabber_state_images()
 	gajim.interface.roster.update_jabber_state_images()
 
+def label_set_autowrap(widget):
+	'''Make labels automatically re-wrap if their containers are resized.
+	Accepts label or container widgets.'''
+	if isinstance (widget, gtk.Container):
+		children = widget.get_children()
+		for i in xrange (len (children)):
+			label_set_autowrap(children[i])
+	elif isinstance(widget, gtk.Label):
+		widget.set_line_wrap(True)
+		widget.connect_after('size-allocate', __label_size_allocate)
+
+def __label_size_allocate(widget, allocation):
+	'''Callback which re-allocates the size of a label.'''
+	layout = widget.get_layout()
+
+	lw_old, lh_old = layout.get_size()
+	# fixed width labels
+	if lw_old/pango.SCALE == allocation.width:
+		return
+
+	# set wrap width to the pango.Layout of the labels ###
+	layout.set_width (allocation.width * pango.SCALE)
+	lw, lh = layout.get_size ()
+
+	if lh_old != lh:
+		widget.set_size_request (-1, lh / pango.SCALE)
+
 # vim: se ts=3:

Modified: branches/osx_newbuildsys/src/history_window.py
===================================================================
--- branches/osx_newbuildsys/src/history_window.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/history_window.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -438,22 +438,26 @@
 					helpers.get_uf_show(show) }
 			tag_msg = 'status'
 
-		# do not do this if gcstats, avoid dupping contact_name
-		# eg. nkour: nkour is now Offline
-		if contact_name and kind != constants.KIND_GCSTATUS:
-			# add stuff before and after contact name
-			before_str = gajim.config.get('before_nickname')
-			before_str = helpers.from_one_line(before_str)
-			after_str = gajim.config.get('after_nickname')
-			after_str = helpers.from_one_line(after_str)
-			format = before_str + contact_name + after_str + ' '
-			buf.insert_with_tags_by_name(end_iter, format, tag_name)
+		if message.startswith('/me ') or message.startswith('/me\n'):
+			tag_msg = tag_name
+		else:
+			# do not do this if gcstats, avoid dupping contact_name
+			# eg. nkour: nkour is now Offline
+			if contact_name and kind != constants.KIND_GCSTATUS:
+				# add stuff before and after contact name
+				before_str = gajim.config.get('before_nickname')
+				before_str = helpers.from_one_line(before_str)
+				after_str = gajim.config.get('after_nickname')
+				after_str = helpers.from_one_line(after_str)
+				format = before_str + contact_name + after_str + ' '
+				buf.insert_with_tags_by_name(end_iter, format, tag_name)
 
 		message = message + '\n'
 		if tag_msg:
-			self.history_textview.print_real_text(message, [tag_msg])
+			self.history_textview.print_real_text(message, [tag_msg],
+				name=contact_name)
 		else:
-			self.history_textview.print_real_text(message)
+			self.history_textview.print_real_text(message, name=contact_name)
 
 	def on_query_entry_activate(self, widget):
 		text = self.query_entry.get_text()

Modified: branches/osx_newbuildsys/src/htmltextview.py
===================================================================
--- branches/osx_newbuildsys/src/htmltextview.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/htmltextview.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -244,49 +244,13 @@
 		tag.set_property('paragraph-background-gdk', color)
 
 
-	#FIXME: when we migrate to 2.10 rm this
-	if gtk.gtk_version >= (2, 8, 5) or gobject.pygtk_version >= (2, 8, 1):
+	def _get_current_attributes(self):
+		attrs = self.textview.get_default_attributes()
+		self.iter.backward_char()
+		self.iter.get_attributes(attrs)
+		self.iter.forward_char()
+		return attrs
 
-		def _get_current_attributes(self):
-			attrs = self.textview.get_default_attributes()
-			self.iter.backward_char()
-			self.iter.get_attributes(attrs)
-			self.iter.forward_char()
-			return attrs
-
-	else:
-
-		# Workaround http://bugzilla.gnome.org/show_bug.cgi?id=317455
-		def _get_current_style_attr(self, propname, comb_oper=None):
-			tags = [tag for tag in self.styles if tag is not None]
-			tags.reverse()
-			is_set_name = propname + '-set'
-			value = None
-			for tag in tags:
-				if tag.get_property(is_set_name):
-					if value is None:
-						value = tag.get_property(propname)
-						if comb_oper is None:
-							return value
-					else:
-						value = comb_oper(value, tag.get_property(propname))
-			return value
-
-		class _FakeAttrs(object):
-			__slots__ = ('font', 'font_scale')
-
-		def _get_current_attributes(self):
-			attrs = self._FakeAttrs()
-			attrs.font_scale = self._get_current_style_attr('scale',
-															operator.mul)
-			if attrs.font_scale is None:
-				attrs.font_scale = 1.0
-			attrs.font = self._get_current_style_attr('font-desc')
-			if attrs.font is None:
-				attrs.font = self.textview.style.font_desc
-			return attrs
-
-
 	def __parse_length_frac_size_allocate(self, textview, allocation,
 										  frac, callback, args):
 		callback(allocation.width*frac, *args)

Modified: branches/osx_newbuildsys/src/message_control.py
===================================================================
--- branches/osx_newbuildsys/src/message_control.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/message_control.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -71,6 +71,17 @@
 		or inactive (state is False)'''
 		pass  # Derived classes MUST implement this method
 
+	def minimizable(self):
+		'''Called to check if control can be minimized'''
+		# NOTE: Derived classes MAY implement this
+		return False
+
+	def safe_shutdown(self):
+		'''Called to check if control can be closed without loosing data.
+		returns True if control can be closed safely else False'''
+		# NOTE: Derived classes MAY implement this
+		return True
+
 	def allow_shutdown(self, method, on_response_yes, on_response_no,
 	on_response_minimize):
 		'''Called to check is a control is allowed to shutdown.
@@ -177,7 +188,10 @@
 				jid += '/' + self.resource
 
 			if not sess:
-				sess = conn.make_new_session(jid)
+				if self.type_id == TYPE_PM:
+					sess = conn.make_new_session(jid, type_='pm')
+				else:
+					sess = conn.make_new_session(jid)
 
 			self.set_session(sess)
 

Modified: branches/osx_newbuildsys/src/message_window.py
===================================================================
--- branches/osx_newbuildsys/src/message_window.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/message_window.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -34,6 +34,7 @@
 import common
 import gtkgui_helpers
 import message_control
+import dialogs
 from chat_control import ChatControlBase
 
 from common import gajim
@@ -146,14 +147,6 @@
 			self.notebook.set_show_tabs(False)
 		self.notebook.set_show_border(gajim.config.get('tabs_border'))
 
-		# if GTK+ version < 2.10, use OUR way to reorder tabs (set up DnD)
-		if gtk.pygtk_version < (2, 10, 0) or gtk.gtk_version < (2, 10, 0):
-			self.hid = self.notebook.connect('drag_data_received',
-				self.on_tab_label_drag_data_received_cb)
-			self.handlers[self.hid] = self.notebook
-			self.notebook.drag_dest_set(gtk.DEST_DEFAULT_ALL, self.DND_TARGETS,
-				gtk.gdk.ACTION_MOVE)
-
 	def change_account_name(self, old_name, new_name):
 		if old_name in self._controls:
 			self._controls[new_name] = self._controls[old_name]
@@ -193,6 +186,32 @@
 			# Destroy the window
 			return False
 
+		# Number of controls that will be closed and for which we'll loose data:
+		# chat, pm, gc that won't go in roster
+		number_of_closed_control = 0
+		for ctrl in self.controls():
+			if not ctrl.safe_shutdown():
+				number_of_closed_control += 1
+
+		if number_of_closed_control > 1:
+			def on_yes1(checked):
+				if checked:
+					gajim.config.set('confirm_close_multiple_tabs', False)
+				self.dont_warn_on_delete = True
+				for ctrl in self.controls():
+					if ctrl.minimizable():
+						ctrl.minimize()
+				win.destroy()
+
+			if not gajim.config.get('confirm_close_multiple_tabs'):
+				# destroy window
+				return False
+			dialogs.YesNoDialog(
+				_('You are going to close several tabs'),
+            _('Do you really want to close them all?'),
+				checktext=_('Do _not ask me again'), on_response_yes=on_yes1)
+			return True
+
 		def on_yes(ctrl):
 			if self.on_delete_ok == 1:
 				self.dont_warn_on_delete = True
@@ -261,11 +280,7 @@
 		control.handlers[id_] = tab_label_box
 		self.notebook.append_page(control.widget, tab_label_box)
 
-		# If GTK+ version >= 2.10, use gtk native way to reorder tabs
-		if gtk.pygtk_version >= (2, 10, 0) and gtk.gtk_version >= (2, 10, 0):
-			self.notebook.set_tab_reorderable(control.widget, True)
-		else:
-			self.setup_tab_dnd(control.widget)
+		self.notebook.set_tab_reorderable(control.widget, True)
 
 		self.redraw_tab(control)
 		if self.parent_paned:
@@ -484,10 +499,6 @@
 			fjid in gajim.last_message_time[ctrl.account]:
 				del gajim.last_message_time[ctrl.account][fjid]
 
-			# Disconnect tab DnD only if GTK version < 2.10
-			if gtk.pygtk_version < (2, 10, 0) or gtk.gtk_version < (2, 10, 0):
-				self.disconnect_tab_dnd(ctrl.widget)
-
 			self.notebook.remove_page(self.notebook.page_num(ctrl.widget))
 
 			del self._controls[ctrl.account][fjid]
@@ -765,31 +776,6 @@
 			control.msg_textview.emit('key_press_event', event)
 			control.msg_textview.grab_focus()
 
-	def setup_tab_dnd(self, child):
-		'''Set tab label as drag source and connect the drag_data_get signal'''
-		tab_label = self.notebook.get_tab_label(child)
-		tab_label.dnd_handler = tab_label.connect('drag_data_get',
-			self.on_tab_label_drag_data_get_cb)
-		self.handlers[tab_label.dnd_handler] = tab_label
-		tab_label.drag_source_set(gtk.gdk.BUTTON1_MASK, self.DND_TARGETS,
-			gtk.gdk.ACTION_MOVE)
-		tab_label.page_num = self.notebook.page_num(child)
-
-	def on_tab_label_drag_data_get_cb(self, widget, drag_context, selection,
-		info, time):
-		source_page_num = self.find_page_num_according_to_tab_label(widget)
-		# 8 is the data size for the string
-		selection.set(selection.target, 8, str(source_page_num))
-
-	def on_tab_label_drag_data_received_cb(self, widget, drag_context, x, y,
-		selection, type_, time):
-		'''Reorder the tabs according to the drop position'''
-		source_page_num = int(selection.data)
-		dest_page_num = self.get_tab_at_xy(x, y)[0]
-		source_child = self.notebook.get_nth_page(source_page_num)
-		if dest_page_num != source_page_num:
-			self.notebook.reorder_child(source_child, dest_page_num)
-
 	def get_tab_at_xy(self, x, y):
 		'''Thanks to Gaim
 		Return the tab under xy and
@@ -831,12 +817,6 @@
 				break
 		return page_num
 
-	def disconnect_tab_dnd(self, child):
-		'''Clean up DnD signals, source and dest'''
-		tab_label = self.notebook.get_tab_label(child)
-		tab_label.drag_source_unset()
-		tab_label.disconnect(tab_label.dnd_handler)
-
 ################################################################################
 class MessageWindowMgr(gobject.GObject):
 	'''A manager and factory for MessageWindow objects'''

Modified: branches/osx_newbuildsys/src/notify.py
===================================================================
--- branches/osx_newbuildsys/src/notify.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/notify.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -58,19 +58,22 @@
 except Exception:
 	USER_HAS_GROWL = False
 
-def setup_indicator_server(): 
-	server = indicate.indicate_server_ref_default() 
-	server.set_type('message.im') 
-	server.set_desktop_file('/usr/share/applications/gajim.desktop') 
-	server.connect('server-display', server_display) 
-	server.show() 
+if gajim.HAVE_INDICATOR:
+	import indicate
 
-def display(indicator, account, jid, msg_type): 
-	gajim.interface.handle_event(account, jid, msg_type) 
-	indicator.hide() 
+def setup_indicator_server():
+	server = indicate.indicate_server_ref_default()
+	server.set_type('message.im')
+	server.set_desktop_file('/usr/share/applications/gajim.desktop')
+	server.connect('server-display', server_display)
+	server.show()
 
-def server_display(server): 
-	win = gajim.interface.roster.window 
+def display(indicator, account, jid, msg_type):
+	gajim.interface.handle_event(account, jid, msg_type)
+	indicator.hide()
+
+def server_display(server):
+	win = gajim.interface.roster.window
 	win.present()
 
 def get_show_in_roster(event, account, contact, session=None):
@@ -612,7 +615,7 @@
 			if version >= [0, 3, 2]:
 				hints['urgency'] = dbus.Byte(0) # Low Urgency
 				hints['category'] = dbus.String(ntype)
-				# it seems notification-daemon doesn't like empty text 
+				# it seems notification-daemon doesn't like empty text
 				if self.text:
 					text = self.text
 				else:

Modified: branches/osx_newbuildsys/src/roster_window.py
===================================================================
--- branches/osx_newbuildsys/src/roster_window.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/roster_window.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -1374,7 +1374,8 @@
 		if self.dragging or not gajim.config.get('scroll_roster_to_last_message'):
 			# do not change selection while DND'ing
 			return
-		self.tree.expand_to_path(path)
+		# Expand his parent, so this path is visible, don't expand it.
+		self.tree.expand_to_path(path[:-1])
 		self.tree.scroll_to_cell(path)
 		self.tree.set_cursor(path)
 
@@ -1967,6 +1968,37 @@
 
 		self.send_status_continue(account, status, txt, auto, to)
 
+	def send_pep(self, account, pep_dict=None):
+		'''Sends pep information (activity, mood)'''
+		if not pep_dict:
+			return
+		# activity
+		if 'activity' in pep_dict and pep_dict['activity'] in pep.ACTIVITIES:
+			activity = pep_dict['activity']
+			if 'subactivity' in pep_dict and \
+			pep_dict['subactivity'] in pep.ACTIVITIES[activity]:
+				subactivity = pep_dict['subactivity']
+			else:
+				subactivity = 'other'
+			if 'activity_text' in pep_dict:
+				activity_text = pep_dict['activity_text']
+			else:
+				activity_text = ''
+			pep.user_send_activity(account, activity, subactivity, activity_text)
+		else:
+			pep.user_send_activity(account, '')
+
+		# mood
+		if 'mood' in pep_dict and pep_dict['mood'] in pep.MOODS:
+			mood = pep_dict['mood']
+			if 'mood_text' in pep_dict:
+				mood_text = pep_dict['mood_text']
+			else:
+				mood_text = ''
+			pep.user_send_mood(account, mood, mood_text)
+		else:
+			pep.user_send_mood(account, '')
+
 	def send_status_continue(self, account, status, txt, auto, to):
 		if gajim.account_is_connected(account) and not to:
 			if status == 'online' and gajim.interface.sleeper.getState() != \
@@ -2042,7 +2074,7 @@
 
 		# print status in chat window and update status/GPG image
 		ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account)
-		if ctrl:
+		if ctrl and ctrl.type_id != message_control.TYPE_GC:
 			ctrl.contact = gajim.contacts.get_contact_with_highest_priority(
 				account, contact.jid)
 			ctrl.update_status_display(name, uf_show, status)
@@ -2095,34 +2127,37 @@
 		if sys.platform == 'darwin':
 			self.make_menu(force=True)
 
-	def get_status_message(self, show, on_response, always_ask=False):
+	def get_status_message(self, show, pep_dict, on_response, always_ask=False):
 		''' get the status message by:
 		1/ looking in default status message
 		2/ asking to user if needed depending on ask_on(ff)line_status and
 			always_ask
+		pep_dict can be None to hide pep things from status message or a dict
 		'''
 		if show in gajim.config.get_per('defaultstatusmsg'):
 			if gajim.config.get_per('defaultstatusmsg', show, 'enabled'):
 				on_response(gajim.config.get_per('defaultstatusmsg', show,
-					'message'))
+					'message'), pep_dict)
 				return
 		if not always_ask and ((show == 'online' and not gajim.config.get(
 		'ask_online_status')) or (show in ('offline', 'invisible') and not \
 		gajim.config.get('ask_offline_status'))):
-			on_response('')
+			on_response('', pep_dict)
 			return
 
-		dlg = dialogs.ChangeStatusMessageDialog(on_response, show)
+		dlg = dialogs.ChangeStatusMessageDialog(on_response, show, pep_dict)
 		dlg.window.present() # show it on current workspace
 
 	def change_status(self, widget, account, status):
 		def change(account, status):
-			def on_response(message):
+			def on_response(message, pep_dict):
 				if message is None:
 					# user pressed Cancel to change status message dialog
 					return
 				self.send_status(account, status, message)
-			self.get_status_message(status, on_response)
+				self.send_pep(account, pep_dict)
+			pep_dict = helpers.get_pep_dict(account)
+			self.get_status_message(status, pep_dict, on_response)
 
 		if status == 'invisible' and self.connected_rooms(account):
 			dialogs.ConfirmationDialog(
@@ -2254,7 +2289,7 @@
 				get_msg = True
 				break
 
-		def on_continue2(message):
+		def on_continue2(message, pep_dict):
 			self.quit_on_next_offline = 0
 			accounts_to_disconnect = []
 			for acct in accounts:
@@ -2264,11 +2299,12 @@
 
 			for acct in accounts_to_disconnect:
 				self.send_status(acct, 'offline', message)
+				self.send_pep(acct, pep_dict)
 
 			if not self.quit_on_next_offline:
 				self.quit_gtkgui_interface()
 
-		def on_continue(message):
+		def on_continue(message, pep_dict):
 			if message is None:
 				# user pressed Cancel to change status message dialog
 				return
@@ -2296,14 +2332,14 @@
 				dialogs.ConfirmationDialog(_('You have unread messages'),
 					_('Messages will only be available for reading them later if you'
 					' have history enabled and contact is in your roster.'),
-					on_response_ok=(on_continue2, message))
+					on_response_ok=(on_continue2, message, pep_dict))
 				return
-			on_continue2(message)
+			on_continue2(message, pep_dict)
 
 		if get_msg:
-			self.get_status_message('offline', on_continue)
+			self.get_status_message('offline', None, on_continue)
 		else:
-			on_continue('')
+			on_continue('', None)
 
 ################################################################################
 ### Menu and GUI callbacks
@@ -2551,7 +2587,7 @@
 	def on_block(self, widget, list_, group=None):
 		''' When clicked on the 'block' button in context menu.
 		list_ is a list of (contact, account)'''
-		def on_continue(msg):
+		def on_continue(msg, pep_dict):
 			if msg is None:
 				# user pressed Cancel to change status message dialog
 				return
@@ -2593,7 +2629,7 @@
 					connection.set_default_list('block')
 				connection.get_privacy_list('block')
 
-		self.get_status_message('offline', on_continue)
+		self.get_status_message('offline', None, on_continue)
 
 	def on_unblock(self, widget, list_, group=None):
 		''' When clicked on the 'unblock' button in context menu. '''
@@ -2683,7 +2719,8 @@
 				return
 			old_text = jid
 			title = _('Rename Group')
-			message = _('Enter a new name for group %s') % jid
+			message = _('Enter a new name for group %s') % \
+				gobject.markup_escape_text(jid)
 
 		def on_renamed(new_text, account, row_type, jid, old_text):
 			if 'rename' in gajim.interface.instances:
@@ -2943,18 +2980,15 @@
 		if url:
 			helpers.launch_browser_mailer('url', url)
 
-	def on_change_activity_activate(self, widget, account):
-		dialogs.ChangeActivityDialog(account)
-
-	def on_change_mood_activate(self, widget, account):
-		dialogs.ChangeMoodDialog(account)
-
 	def on_change_status_message_activate(self, widget, account):
 		show = gajim.SHOW_LIST[gajim.connections[account].connected]
-		def on_response(message):
-			if message is not None: # None is if user pressed Cancel
-				self.send_status(account, show, message)
-		dialogs.ChangeStatusMessageDialog(on_response, show)
+		pep_dict = helpers.get_pep_dict(account)
+		def on_response(message, pep_dict):
+			if message is None: # None is if user pressed Cancel
+				return
+			self.send_status(account, show, message)
+			self.send_pep(account, pep_dict)
+		dialogs.ChangeStatusMessageDialog(on_response, show, pep_dict)
 
 	def on_add_to_roster(self, widget, contact, account):
 		dialogs.AddNewContactWindow(account, contact.jid, contact.name)
@@ -3059,7 +3093,8 @@
 				show = helpers.get_global_show()
 				if show == 'offline':
 					return True
-				def on_response(message):
+				pep_dict = helpers.get_global_pep()
+				def on_response(message, pep_dict):
 					if message is None:
 						return True
 					for acct in gajim.connections:
@@ -3069,7 +3104,8 @@
 						current_show = gajim.SHOW_LIST[gajim.connections[acct].\
 							connected]
 						self.send_status(acct, current_show, message)
-				dialogs.ChangeStatusMessageDialog(on_response, show)
+						self.send_pep(acct, pep_dict)
+				dialogs.ChangeStatusMessageDialog(on_response, show, pep_dict)
 			return True
 
 		elif event.button == 1: # Left click
@@ -3171,7 +3207,7 @@
 	def on_send_custom_status(self, widget, contact_list, show, group=None):
 		'''send custom status'''
 		# contact_list has only one element except if group != None
-		def on_response(message):
+		def on_response(message, pep_dict):
 			if message is None: # None if user pressed Cancel
 				return
 			account_list = []
@@ -3204,7 +3240,7 @@
 					jid += '/' + contact.resource
 				self.send_status(account, show, message, to=jid)
 
-		self.get_status_message(show, on_response, always_ask=True)
+		self.get_status_message(show, None, on_response, always_ask=True)
 
 	def on_status_combobox_changed(self, widget):
 		'''When we change our status via the combobox'''
@@ -3228,7 +3264,8 @@
 			# 'Change status message' selected:
 			# do not change show, just show change status dialog
 			status = model[self.previous_status_combobox_active][2].decode('utf-8')
-			def on_response(message):
+			pep_dict = helpers.get_global_pep()
+			def on_response(message, pep_dict):
 				if message is not None: # None if user pressed Cancel
 					for account in accounts:
 						if not gajim.config.get_per('accounts', account,
@@ -3237,11 +3274,12 @@
 						current_show = gajim.SHOW_LIST[
 							gajim.connections[account].connected]
 						self.send_status(account, current_show, message)
+						self.send_pep(account, pep_dict)
 				self.combobox_callback_active = False
 				self.status_combobox.set_active(
 					self.previous_status_combobox_active)
 				self.combobox_callback_active = True
-			dialogs.ChangeStatusMessageDialog(on_response, status)
+			dialogs.ChangeStatusMessageDialog(on_response, status, pep_dict)
 			return
 		# we are about to change show, so save this new show so in case
 		# after user chooses "Change status message" menuitem
@@ -3249,7 +3287,7 @@
 		self.previous_status_combobox_active = active
 		connected_accounts = gajim.get_number_of_connected_accounts()
 
-		def on_continue(message):
+		def on_continue(message, pep_dict):
 			if message is None:
 				# user pressed Cancel to change status message dialog
 				self.update_status_combobox()
@@ -3272,6 +3310,7 @@
 				if not global_sync_connected_accounts > 0 or \
 				gajim.connections[account].connected > 0:
 					self.send_status(account, status, message)
+					self.send_pep(account, pep_dict)
 			self.update_status_combobox()
 
 		if status == 'invisible':
@@ -3287,7 +3326,7 @@
 						break
 			if bug_user:
 				def on_ok():
-					self.get_status_message(status, on_continue)
+					self.get_status_message(status, None, on_continue)
 
 				def on_cancel():
 					self.update_status_combobox()
@@ -3300,7 +3339,8 @@
 					on_response_cancel=on_cancel)
 				return
 
-		self.get_status_message(status, on_continue)
+		pep_dict = helpers.get_global_pep()
+		self.get_status_message(status, pep_dict, on_continue)
 
 	def on_preferences_menuitem_activate(self, widget):
 		if 'preferences' in gajim.interface.instances:
@@ -4948,14 +4988,6 @@
 				else:
 					item.set_active(have_tune)
 					item.connect('toggled', self.on_publish_tune_toggled, account)
-				item = gtk.CheckMenuItem(_('Mood'))
-				pep_submenu.append(item)
-				item.set_active(len(gajim.connections[account].mood) > 0)
-				item.connect('activate', self.on_change_mood_activate, account)
-				item = gtk.CheckMenuItem(_('Activity'))
-				pep_submenu.append(item)
-				item.set_active(len(gajim.connections[account].activity) > 0)
-				item.connect('activate', self.on_change_activity_activate, account)
 
 				pep_config = gtk.ImageMenuItem(_('Configure Services...'))
 				item = gtk.SeparatorMenuItem()

Modified: branches/osx_newbuildsys/src/session.py
===================================================================
--- branches/osx_newbuildsys/src/session.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/session.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -365,8 +365,16 @@
 				gajim.interface.roster.draw_contact(jid, self.conn.name)
 
 			gajim.interface.roster.show_title() # we show the * or [n]
-		# Select contact row in roster.
-		gajim.interface.roster.select_contact(jid, self.conn.name)
+		# Select the big brother contact in roster, it's visible because it has
+		# events.
+		family = gajim.contacts.get_metacontacts_family(self.conn.name, jid)
+		if family:
+			nearby_family, bb_jid, bb_account = \
+				gajim.interface.roster._get_nearby_family_and_big_brother(family,
+				self.conn.name)
+		else:
+			bb_jid, bb_account = jid, self.conn.name
+		gajim.interface.roster.select_contact(bb_jid, bb_account)
 
 	# ---- ESessions stuff ---
 

Modified: branches/osx_newbuildsys/src/systray.py
===================================================================
--- branches/osx_newbuildsys/src/systray.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/systray.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -38,6 +38,7 @@
 
 from common import gajim
 from common import helpers
+from common import pep
 
 HAS_SYSTRAY_CAPABILITIES = True
 
@@ -287,12 +288,11 @@
 		sounds_mute_menuitem.set_active(not gajim.config.get('sounds_on'))
 
 		if os.name == 'nt':
-			if gtk.pygtk_version >= (2, 10, 0) and gtk.gtk_version >= (2, 10, 0):
-				if self.added_hide_menuitem is False:
-					self.systray_context_menu.prepend(gtk.SeparatorMenuItem())
-					item = gtk.MenuItem(_('Hide this menu'))
-					self.systray_context_menu.prepend(item)
-					self.added_hide_menuitem = True
+			if self.added_hide_menuitem is False:
+				self.systray_context_menu.prepend(gtk.SeparatorMenuItem())
+				item = gtk.MenuItem(_('Hide this menu'))
+				self.systray_context_menu.prepend(item)
+				self.added_hide_menuitem = True
 
 		self.systray_context_menu.show_all()
 		self.systray_context_menu.popup(None, None, None, 0,
@@ -326,13 +326,14 @@
 		win = gajim.interface.roster.window
 		if len(gajim.events.get_systray_events()) == 0:
 			# No pending events, so toggle visible/hidden for roster window
-			if win.get_property('visible') and (win.get_property(
+			if not win.iconify_initially and (win.get_property(
 			'has-toplevel-focus') or os.name == 'nt'):
 				# visible in ANY virtual desktop?
 
 				# we could be in another VD right now. eg vd2
 				# and we want to show it in vd2
 				if not gtkgui_helpers.possibly_move_window_in_current_desktop(win):
+					win.set_property('skip-taskbar-hint', False)
 					win.iconify() # else we hide it from VD that was visible in
 					win.set_property('skip-taskbar-hint', True)
 			else:
@@ -384,7 +385,7 @@
 		model = gajim.interface.roster.status_combobox.get_model()
 		active = gajim.interface.roster.status_combobox.get_active()
 		status = model[active][2].decode('utf-8')
-		def on_response(message):
+		def on_response(message, pep_dict):
 			if message is None: # None if user press Cancel
 				return
 			accounts = gajim.connections.keys()
@@ -394,6 +395,7 @@
 					continue
 				show = gajim.SHOW_LIST[gajim.connections[acct].connected]
 				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()
 

Modified: branches/osx_newbuildsys/src/tooltips.py
===================================================================
--- branches/osx_newbuildsys/src/tooltips.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/tooltips.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -77,8 +77,7 @@
 		self.win.set_border_width(3)
 		self.win.set_resizable(False)
 		self.win.set_name('gtk-tooltips')
-		if gtk.gtk_version >= (2, 10, 0) and gtk.pygtk_version >= (2, 10, 0):
-			self.win.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP)
+		self.win.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP)
 
 		self.win.set_events(gtk.gdk.POINTER_MOTION_MASK)
 		self.win.connect_after('expose_event', self.expose)

Modified: branches/osx_newbuildsys/src/vcard.py
===================================================================
--- branches/osx_newbuildsys/src/vcard.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/src/vcard.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -164,13 +164,8 @@
 	def set_value(self, entry_name, value):
 		try:
 			if value and entry_name == 'URL_label':
-				if gtk.pygtk_version >= (2, 10, 0) and gtk.gtk_version >= (2, 10, 0):
-					widget = gtk.LinkButton(value, value)
-					widget.set_alignment(0, 0)
-				else:
-					widget = gtk.Label(value)
-					widget.set_alignment(0, 0)
-					widget.set_selectable(True)
+				widget = gtk.LinkButton(value, value)
+				widget.set_alignment(0, 0)
 				widget.show()
 				table = self.xml.get_widget('personal_info_table')
 				table.attach(widget, 1, 4, 3, 4, yoptions = 0)
@@ -492,13 +487,8 @@
 	def set_value(self, entry_name, value):
 		try:
 			if value and entry_name == 'URL_label':
-				if gtk.pygtk_version >= (2, 10, 0) and gtk.gtk_version >= (2, 10, 0):
-					widget = gtk.LinkButton(value, value)
-					widget.set_alignment(0, 0)
-				else:
-					widget = gtk.Label(value)
-					widget.set_selectable(True)
-					widget.set_alignment(0, 0)
+				widget = gtk.LinkButton(value, value)
+				widget.set_alignment(0, 0)
 				table = self.xml.get_widget('personal_info_table')
 				table.attach(widget, 1, 4, 3, 4, yoptions = 0)
 			else:

Modified: branches/osx_newbuildsys/test/lib/mock.py
===================================================================
--- branches/osx_newbuildsys/test/lib/mock.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/test/lib/mock.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -11,6 +11,7 @@
 #
 #
 #     Copyright (c) 2005, Dave Kirby
+#     Copyright (c) 2009, Yann Leboulanger
 #
 #     All rights reserved.
 #
@@ -60,7 +61,7 @@
 class MockInterfaceError(Exception):
     pass
 
-class Mock:
+class Mock(object):
     """
     The Mock class emulates any other class for testing purposes.
     All method calls are stored for later examination.
@@ -83,6 +84,7 @@
         self.mockAllCalledMethods = []
         self.mockReturnValues = returnValues or {}
         self.mockExpectations = {}
+        self.realClass = realClass
         self.realClassMethods = None
         if realClass:
             self.realClassMethods = dict(inspect.getmembers(realClass, inspect.isroutine))
@@ -92,7 +94,7 @@
         self._setupSubclassMethodInterceptors()
 
     def _setupSubclassMethodInterceptors(self):
-        methods = inspect.getmembers(self.__class__,inspect.isroutine)
+        methods = inspect.getmembers(self.realClass,inspect.isroutine)
         baseMethods = dict(inspect.getmembers(Mock, inspect.ismethod))
         for m in methods:
             name = m[0]
@@ -119,7 +121,7 @@
         if self.realClassMethods is None:
             return
         if name not in self.realClassMethods:
-            raise MockInterfaceError("Calling mock method '%s' that was not found in the original class" % name)
+            return
 
         func = self.realClassMethods[name]
         try:
@@ -268,7 +270,7 @@
     def makeCall(self, params, kwparams):
         if self.handcrafted:
             allPosParams = (self.mock,) + params
-            func = _findFunc(self.mock.__class__, self.name)
+            func = _findFunc(self.mock.realClass, self.name)
             if not func:
                 raise NotImplementedError
             return func(*allPosParams, **kwparams)
@@ -463,4 +465,4 @@
 
 
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:

Modified: branches/osx_newbuildsys/test/lib/xmpp_mocks.py
===================================================================
--- branches/osx_newbuildsys/test/lib/xmpp_mocks.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/test/lib/xmpp_mocks.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -47,7 +47,7 @@
 		Returns True if event was set, False on timeout
 		'''
 		self._event.wait(IDLEMOCK_TIMEOUT)
-		if self._event.is_set():
+		if self._event.isSet():
 			self._event.clear()
 			return True
 		else:

Modified: branches/osx_newbuildsys/test/runtests.py
===================================================================
--- branches/osx_newbuildsys/test/runtests.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/test/runtests.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -35,18 +35,18 @@
 			sys.exit(2)
 
 # new test modules need to be added manually
-#modules = ( 'test_xmpp_dispatcher_nb',
-#				'test_xmpp_client_nb',
-#				'test_xmpp_transports_nb',
-#				'test_resolver',
-#				'test_sessions',
-#				'test_caps',
-#			 )
-modules = ()
+modules = ( 'test_xmpp_dispatcher_nb',
+				'test_xmpp_client_nb',
+				'test_xmpp_transports_nb',
+				'test_resolver',
+				'test_caps',
+			 )
+#modules = ()
 
 if use_x:
 	modules += ('test_misc_interface',
 					'test_roster',
+					'test_sessions',
 	)
 
 nb_errors = 0

Modified: branches/osx_newbuildsys/test/test_resolver.py
===================================================================
--- branches/osx_newbuildsys/test/test_resolver.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/test/test_resolver.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -32,8 +32,8 @@
 		self.iq = self.idlequeue_thread.iq
 		self._reset()
 		self.resolver = None
-	
-	def tear_down(self):
+
+	def tearDown(self):
 		self.idlequeue_thread.stop_thread()
 		self.idlequeue_thread.join()
 

Modified: branches/osx_newbuildsys/test/test_xmpp_client_nb.py
===================================================================
--- branches/osx_newbuildsys/test/test_xmpp_client_nb.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/test/test_xmpp_client_nb.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -13,6 +13,9 @@
 from mock import Mock
 from common.xmpp import client_nb
 
+#import logging
+#log = logging.getLogger('gajim')
+#log.setLevel(logging.DEBUG)
 
 # (XMPP server hostname, c2s port). Script will connect to the machine.
 xmpp_server_port = ('gajim.org', 5222)
@@ -37,7 +40,7 @@
 
 		self.client = None
 
-	def open_stream(self, server_port):
+	def open_stream(self, server_port, wrong_pass=False):
 		'''
 		Method opening the XMPP connection. It returns when <stream:features>
 		is received from server.
@@ -46,10 +49,19 @@
 		connect.
 		'''
 
+		class TempConnection():
+			def get_password(self, cb):
+				if wrong_pass:
+					cb('wrong pass')
+				else:
+					cb(credentials[1])
+			def on_connect_failure(self):
+				pass
+
 		self.client = client_nb.NonBlockingClient(
 			domain=server_port[0],
 			idlequeue=self.idlequeue_thread.iq,
-			caller=Mock())
+			caller=Mock(realClass=TempConnection))
 
 		self.client.connect(
 			hostname=server_port[0],
@@ -86,7 +98,6 @@
 		Does disconnecting of connected client. Returns when TCP connection is 
 		closed.
 		'''
-		#self.client.start_disconnect(None, on_disconnect=self.connection.set_event)
 		self.client.RegisterDisconnectHandler(self.connection.set_event)
 		self.client.disconnect()
 
@@ -106,7 +117,7 @@
 
 		self.client_auth(credentials[0], credentials[1], credentials[2], sasl=1)
 		self.assert_(self.connection.con)
-		self.assert_(self.connection.auth=='sasl', msg="Unable to auth via SASL")
+		self.assert_(self.connection.auth=='sasl', msg='Unable to auth via SASL')
 
 		self.do_disconnect()
 
@@ -119,8 +130,12 @@
 		self.assert_(self.client.get_connect_type())
 		self.client_auth(credentials[0], credentials[1], credentials[2], sasl=0)
 		self.assert_(self.connection.con)
-		self.assert_(self.connection.auth=='old_auth',
-			msg="Unable to auth via old_auth")
+		features = self.client.Dispatcher.Stream.features
+		if not features.getTag('auth'):
+			print "Server doesn't support old authentication type, ignoring test"
+		else:
+			self.assert_(self.connection.auth=='old_auth',
+				msg='Unable to auth via old_auth')
 		self.do_disconnect()
 
 	def test_connect_to_nonexisting_host(self):
@@ -143,9 +158,9 @@
 		'''
 		Connecting with invalid password.
 		'''
-		self.open_stream(xmpp_server_port)
+		self.open_stream(xmpp_server_port, wrong_pass=True)
 		self.assert_(self.client.get_connect_type())
-		self.client_auth(credentials[0], "wrong pass", credentials[2], sasl=1)
+		self.client_auth(credentials[0], 'wrong pass', credentials[2], sasl=1)
 		self.assert_(self.connection.auth is None)
 		self.do_disconnect()
 

Modified: branches/osx_newbuildsys/test/test_xmpp_dispatcher_nb.py
===================================================================
--- branches/osx_newbuildsys/test/test_xmpp_dispatcher_nb.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/test/test_xmpp_dispatcher_nb.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -35,6 +35,7 @@
 	def _simulate_connect(self):
 		self.dispatcher.PlugIn(self.client) # client is owner
 		# Simulate that we have established a connection
+		self.dispatcher.StreamInit()
 		self.dispatcher.ProcessNonBlocking("<stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:client'>")
 
 	def test_unbound_namespace_prefix(self):

Modified: branches/osx_newbuildsys/test/test_xmpp_transports_nb.py
===================================================================
--- branches/osx_newbuildsys/test/test_xmpp_transports_nb.py	2009-04-30 15:20:37 UTC (rev 11254)
+++ branches/osx_newbuildsys/test/test_xmpp_transports_nb.py	2009-04-30 17:05:59 UTC (rev 11255)
@@ -48,7 +48,7 @@
  						'type': u'bosh',
  						'useauth': True,
  						'user': u'user'}
-		check_dict(bosh_dict, host=u'gajim.org', port=80, user=u'user',
+		check_dict(bosh_dict, host=u'gajim.org', port=5280, user=u'user',
 			passwd=u'pass')
 
 		proxy_dict = {'bosh_content': u'text/xml; charset=utf-8',
@@ -307,17 +307,18 @@
 		transport.onreceive(self.expect_receive(body, msg='Failed: In one go'))
 		transport._on_receive(message)
 		self.assertTrue(self.have_received_expected(), msg='Failed: In one go')
-		
+
 		# try to receive in chunks
 		chunk1, chunk2, chunk3  = message[:20], message[20:73], message[73:]
 		nextmessage_chunk = "\r\n\r\nHTTP/1.1 200 OK\r\nContent-Type: text/x"
 		chunks = (chunk1, chunk2, chunk3, nextmessage_chunk)
-	
-		transport.onreceive(self.expect_receive(body, msg='Failed: In chunks'))
-		for chunk in chunks:
-			transport._on_receive(chunk)
-		self.assertTrue(self.have_received_expected(), msg='Failed: In chunks')
 
+		#TODO: BOSH implementatio ndoesn't support that for the moment
+#		transport.onreceive(self.expect_receive(body, msg='Failed: In chunks'))
+#		for chunk in chunks:
+#			transport._on_receive(chunk)
+#		self.assertTrue(self.have_received_expected(), msg='Failed: In chunks')
+
 if __name__ == '__main__':
 	unittest.main()
 



More information about the Commits mailing list